projects / portage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63d7e91 d54430b)
Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 20 Sep 2010 15:20:35 +0000 (17:20 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 20 Sep 2010 15:20:35 +0000 (17:20 +0200)
Conflicts:
pym/_emerge/RepoDisplay.py

1  2 
pym/_emerge/depgraph.py patch | diff1 | diff2 | blob | history

diff --cc pym/_emerge/depgraph.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.