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

author	Fabian Groffen <grobian@gentoo.org>
	Mon, 6 Sep 2010 18:11:49 +0000 (20:11 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Mon, 6 Sep 2010 18:11:49 +0000 (20:11 +0200)
commit	aab75a6f0857fa1fd1b8897fe0b1d141e98bebdb
tree	8b231e686317032ba046ebab16f0919f239a74dc	tree \| snapshot
parent	9205b712e0d635a633a6a50b92833f0e60b88c2b	commit \| diff
parent	46cafb3996d827d208d486b85c7f4248a6e8c826	commit \| diff

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

Conflicts:
pym/portage/dispatch_conf.py

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

bin/ebuild-helpers/prepstrip	diff1 \|	diff2 \|	blob \| history
bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/misc-functions.sh	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.py	diff1 \|	diff2 \|	blob \| history
pym/portage/__init__.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/package/ebuild/config.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/doebuild.py	diff1 \|	diff2 \|	blob \| history