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

projects / portage.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dac6447 398cc46)

author	Fabian Groffen <grobian@gentoo.org>
	Tue, 24 Aug 2010 19:58:24 +0000 (21:58 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Tue, 24 Aug 2010 19:58:24 +0000 (21:58 +0200)
commit	8df04ae3a1090aed27f6c3ca837e8e608235780a
tree	e0d79e248870ac4e8382abf7850cc8176fa83d54	tree \| snapshot
parent	dac64477739ea7d495d65157ec8a55fa38ce45ad	commit \| diff
parent	398cc46ca2893689997eae5940d13e87284f8237	commit \| diff

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

Conflicts:
bin/misc-functions.sh
mkrelease.sh

16 files changed:

bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/isolated-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/misc-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Binpkg.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/BinpkgExtractorAsync.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/actions.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.py	diff1 \|	diff2 \|	blob \| history
pym/portage/const.py	diff1 \|	diff2 \|	blob \| history
pym/portage/data.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.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/doebuild.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	diff1 \|	diff2 \|	blob \| history

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