projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e0dabb 41f25eb)
net-p2p/amule: Resolve merge conflicts.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 22 Jan 2016 10:39:32 +0000 (10:39 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 22 Jan 2016 10:39:32 +0000 (10:39 +0000)

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