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

author	Fabian Groffen <grobian@gentoo.org>
	Sun, 17 Jul 2011 08:11:06 +0000 (10:11 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Sun, 17 Jul 2011 08:11:06 +0000 (10:11 +0200)
commit	b128cd7bd251a176ff08f84503fc6764a33311f1
tree	17fb4c6e89a74ed6e8fbc063946f56d243f711d9	tree \| snapshot
parent	6057f540e9a25014bd95072fe25c65f54f64e28f	commit \| diff
parent	1040aaeaf2023717d99f40377583ca7453f60d33	commit \| diff

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

Conflicts:
bin/binhost-snapshot
bin/ebuild-helpers/doman
bin/ebuild-helpers/prepall
bin/ebuild-helpers/prepallman
bin/ebuild-helpers/prepinfo
bin/ebuild-helpers/prepman
bin/ebuild-helpers/prepstrip
bin/ebuild.sh
bin/filter-bash-environment.py
bin/misc-functions.sh
pym/_emerge/Binpkg.py
pym/_emerge/main.py
pym/portage/elog/mod_save.py
pym/portage/elog/mod_save_summary.py
pym/portage/package/ebuild/prepare_build_dirs.py

35 files changed:

bin/binhost-snapshot	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/doman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepall	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepallman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepinfo	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepstrip	diff1 \|	diff2 \|	blob \| history
bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/egencache	diff1 \|	diff2 \|	blob \| history
bin/emerge-webrsync	diff1 \|	diff2 \|	blob \| history
bin/filter-bash-environment.py	diff1 \|	diff2 \|	blob \| history
bin/isolated-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/misc-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/portageq	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Binpkg.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/EbuildBuild.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/actions.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/emergelog.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/main.py	diff1 \|	diff2 \|	blob \| history
pym/portage/__init__.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/elog/mod_save.py	diff1 \|	diff2 \|	blob \| history
pym/portage/elog/mod_save_summary.py	diff1 \|	diff2 \|	blob \| history
pym/portage/output.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/_config/special_env_vars.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/package/ebuild/prepare_build_dirs.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.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.

RSS Atom

bin/binhost-snapshot	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/doman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepall	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepallman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepinfo	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepstrip	diff1 \|	diff2 \|	blob \| history
bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/egencache	diff1 \|	diff2 \|	blob \| history
bin/emerge-webrsync	diff1 \|	diff2 \|	blob \| history
bin/filter-bash-environment.py	diff1 \|	diff2 \|	blob \| history
bin/isolated-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/misc-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/portageq	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Binpkg.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/EbuildBuild.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/actions.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/emergelog.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/main.py	diff1 \|	diff2 \|	blob \| history
pym/portage/__init__.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/elog/mod_save.py	diff1 \|	diff2 \|	blob \| history
pym/portage/elog/mod_save_summary.py	diff1 \|	diff2 \|	blob \| history
pym/portage/output.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/_config/special_env_vars.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/package/ebuild/prepare_build_dirs.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/env_update.py	diff1 \|	diff2 \|	blob \| history