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

projects / portage.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 12ff9b8 46cf3e0)

author	Fabian Groffen <grobian@gentoo.org>
	Mon, 13 Dec 2010 17:51:57 +0000 (18:51 +0100)
committer	Fabian Groffen <grobian@gentoo.org>
	Mon, 13 Dec 2010 17:51:57 +0000 (18:51 +0100)
commit	ee198131306adf6775ea9af1b71eeb53ce3887e4
tree	6cf4f0d9f146495284069bb94a8fbd6ef35ca100	tree \| snapshot
parent	12ff9b870584bc3c7b887a505192c686fd45ea0b	commit \| diff
parent	46cf3e08bc2312414fa482b8674df5ede52cbe91	commit \| diff

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

15 files changed:

bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/etc-update	diff1 \|	diff2 \|	blob \| history
bin/quickpkg	diff1 \|	diff2 \|	blob \| history
cnf/dispatch-conf.conf	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Binpkg.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/EbuildBuild.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Package.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.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/output.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/versions.py	diff1 \|	diff2 \|	blob \| history

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