projects / portage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5551d44 68462da)
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Tue, 13 Sep 2011 17:40:17 +0000 (19:40 +0200)
committerFabian Groffen <grobian@gentoo.org>
Tue, 13 Sep 2011 17:40:17 +0000 (19:40 +0200)
commit74fec93ae94c0149cac8a6e2af49ee2492c97cce
tree623b77d45f7819b5b59f0e51970e5d01f9e83021tree | snapshot
parent5551d449dffe531935dcd672f37c5cd3abd55a44commit | diff
parent68462daca775701f090cf9fc442310512c585e6bcommit | diff
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild.sh
bin/egencache
bin/isolated-functions.sh
pym/portage/dbapi/vartree.py
pym/portage/elog/mod_save.py
pym/portage/elog/mod_save_summary.py
pym/portage/package/ebuild/doebuild.py
pym/portage/util/env_update.py
16 files changed:
bin/ebuild diff1 | diff2 | blob | history
bin/ebuild.sh diff1 | diff2 | blob | history
bin/egencache diff1 | diff2 | blob | history
bin/isolated-functions.sh diff1 | diff2 | blob | history
bin/repoman 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/__init__.py diff1 | diff2 | blob | history
pym/portage/dbapi/vartree.py diff1 | diff2 | blob | history
pym/portage/elog/mod_save.py diff1 | diff2 | blob | history
pym/portage/getbinpkg.py diff1 | diff2 | blob | history
pym/portage/package/ebuild/config.py diff1 | diff2 | blob | history
pym/portage/package/ebuild/doebuild.py diff1 | diff2 | blob | history
pym/portage/package/ebuild/fetch.py diff1 | diff2 | blob | history
pym/portage/util/env_update.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.