projects / portage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0fd5969 e497723)
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 29 Aug 2011 18:56:30 +0000 (20:56 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 29 Aug 2011 18:56:30 +0000 (20:56 +0200)
commit5b6156b085ab5ae518fa6c4ed9b2e2c5b75fd184
tree03bdca1d73e1acd4b703bd353f89dc9c804dc705tree | snapshot
parent0fd596977391c67bcda11e2c81ad033e03dbc8f9commit | diff
parente49772302478a05a2df6f8fa6d2086cf7ccd2bc7commit | diff
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/dispatch-conf
bin/repoman
pym/portage/__init__.py
pym/portage/tests/runTests
pym/portage/util/env_update.py
runtests.sh
16 files changed:
bin/dispatch-conf diff1 | diff2 | blob | history
bin/ebuild.sh diff1 | diff2 | blob | history
bin/egencache diff1 | diff2 | blob | history
bin/repoman 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/portage/__init__.py diff1 | diff2 | blob | history
pym/portage/data.py diff1 | diff2 | blob | history
pym/portage/dbapi/vartree.py diff1 | diff2 | blob | history
pym/portage/package/ebuild/doebuild.py diff1 | diff2 | blob | history
pym/portage/package/ebuild/prepare_build_dirs.py diff1 | diff2 | blob | history
pym/portage/util/_dyn_libs/LinkageMapELF.py diff1 | diff2 | blob | history
pym/portage/util/_pty.py diff1 | diff2 | blob | history
pym/portage/util/env_update.py diff1 | diff2 | blob | history
runtests.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.