git.tremily.us Git - portage.git/commit

author	Fabian Groffen <grobian@gentoo.org>
	Fri, 6 Jul 2012 07:02:23 +0000 (09:02 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Fri, 6 Jul 2012 07:02:23 +0000 (09:02 +0200)
commit	f028e1bfb2b97990b558b0c1a8782838aeae175c
tree	bfaceeb9333f6ca440003e043fae5b15c43e7cd7	tree \| snapshot
parent	4025638c00de5e9e21ef419a5b107141525283ca	commit \| diff
parent	138e6030a70ca3ffe4f2da8fa9f8f5a913e0ccd8	commit \| diff

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/dohtml.py
bin/ebuild
bin/ebuild-helpers/ecompressdir
bin/ebuild-helpers/prepstrip
bin/ebuild-ipc.py
bin/egencache
bin/emaint
bin/emerge
bin/misc-functions.sh
bin/quickpkg
pym/_emerge/actions.py
pym/portage/dbapi/vartree.py
pym/portage/dispatch_conf.py

36 files changed:

bin/dohtml.py	diff1 \|	diff2 \|	blob \| history
bin/ebuild	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/ecompressdir	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepstrip	diff1 \|	diff2 \|	blob \| history
bin/ebuild-ipc.py	diff1 \|	diff2 \|	blob \| history
bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/egencache	diff1 \|	diff2 \|	blob \| history
bin/emaint	diff1 \|	diff2 \|	blob \| history
bin/emerge	diff1 \|	diff2 \|	blob \| history
bin/isolated-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/misc-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/quickpkg	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
bin/save-ebuild-env.sh	diff1 \|	diff2 \|	blob \| history
cnf/make.globals	diff1 \|	diff2 \|	blob \| history
man/emerge.1	diff1 \|	diff2 \|	blob \| history
man/make.conf.5	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Package.py	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/_sets/files.py	diff1 \|	diff2 \|	blob \| history
pym/portage/const.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/bintree.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/vartree.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dispatch_conf.py	diff1 \|	diff2 \|	blob \| history
pym/portage/getbinpkg.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/_config/special_env_vars.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/tests/runTests	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	diff1 \|	diff2 \|	blob \| history
pym/portage/versions.py	diff1 \|	diff2 \|	blob \| history
runtests.sh	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

bin/dohtml.py	diff1 \|	diff2 \|	blob \| history
bin/ebuild	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/ecompressdir	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepstrip	diff1 \|	diff2 \|	blob \| history
bin/ebuild-ipc.py	diff1 \|	diff2 \|	blob \| history
bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/egencache	diff1 \|	diff2 \|	blob \| history
bin/emaint	diff1 \|	diff2 \|	blob \| history
bin/emerge	diff1 \|	diff2 \|	blob \| history
bin/isolated-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/misc-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/quickpkg	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
bin/save-ebuild-env.sh	diff1 \|	diff2 \|	blob \| history
cnf/make.globals	diff1 \|	diff2 \|	blob \| history
man/emerge.1	diff1 \|	diff2 \|	blob \| history
man/make.conf.5	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Package.py	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/_sets/files.py	diff1 \|	diff2 \|	blob \| history
pym/portage/const.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/bintree.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/vartree.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dispatch_conf.py	diff1 \|	diff2 \|	blob \| history
pym/portage/getbinpkg.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/_config/special_env_vars.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/tests/runTests	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	diff1 \|	diff2 \|	blob \| history
pym/portage/versions.py	diff1 \|	diff2 \|	blob \| history
runtests.sh	diff1 \|	diff2 \|	blob \| history