projects / portage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11eb693 f456171)
Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 13 Nov 2010 19:36:37 +0000 (20:36 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sat, 13 Nov 2010 19:36:37 +0000 (20:36 +0100)
Conflicts:
pym/portage/dbapi/vartree.py

1  2 
bin/regenworld patch | diff1 | diff2 | blob | history
bin/repoman patch | diff1 | diff2 | blob | history
pym/portage/dbapi/vartree.py patch | diff1 | diff2 | blob | history

diff --cc bin/regenworld
Simple merge
diff --cc bin/repoman
Simple merge
diff --cc pym/portage/dbapi/vartree.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.