projects / portage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f1ce62 eef823e)
Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 31 Jul 2010 14:54:13 +0000 (16:54 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sat, 31 Jul 2010 14:54:13 +0000 (16:54 +0200)
commit1233f26a7163b6f155a8aeb0ed258f8b686bf535
tree48b49446e1ff77e64c3f7558636cdeb102f0cad9tree | snapshot
parent5f1ce62c0fbff9cf475ec5d13f26a3cd8bc04eaccommit | diff
parenteef823e9c368d2feeafc187b1ad00092a5086a12commit | diff
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/portage/_global_updates.py

WORLD_FILE already includes EPREFIX (derived from PRIVATE_PATH), so no
need to add EPREFIX to it again
bin/emaint diff1 | diff2 | blob | history
man/emerge.1 diff1 | diff2 | blob | history
pym/_emerge/actions.py diff1 | diff2 | blob | history
pym/_emerge/depgraph.py diff1 | diff2 | blob | history
pym/_emerge/main.py diff1 | diff2 | blob | history
pym/portage/dbapi/bintree.py diff1 | diff2 | blob | history
pym/portage/dbapi/vartree.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.