projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19b4ea4 dc09392)
Merge remote-tracking branch 'remotes/github/pr/45'
authorAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>
Sat, 5 Sep 2015 16:18:57 +0000 (18:18 +0200)
committerAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>
Sat, 5 Sep 2015 16:18:57 +0000 (18:18 +0200)
Closes gentoo/gentoo#45

Fix file collisions between kde4, kdepim and telepathy internationalization


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.