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

author	Fabian Groffen <grobian@gentoo.org>
	Tue, 21 Dec 2010 19:45:49 +0000 (20:45 +0100)
committer	Fabian Groffen <grobian@gentoo.org>
	Tue, 21 Dec 2010 19:45:49 +0000 (20:45 +0100)
commit	16e590bdb7e960ca84f3eb7ed5a2ca275ddd1b65
tree	8d8258d2a0d3280dcae579a82d87178ddeea1db7	tree \| snapshot
parent	b7b86e952c510ad5c24cedb96252aacee7763730	commit \| diff
parent	188c0f842ef6ff146589b0c8542da839c296d0d2	commit \| diff

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

Conflicts:
bin/ebuild-helpers/ecompressdir
bin/ebuild.sh

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

bin/ebuild	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/ecompress	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/ecompressdir	diff1 \|	diff2 \|	blob \| history
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/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