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

projects / portage.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f17de73 f9eb68b)

author	Fabian Groffen <grobian@gentoo.org>
	Tue, 17 Aug 2010 16:46:20 +0000 (18:46 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Tue, 17 Aug 2010 16:46:20 +0000 (18:46 +0200)
commit	86e8de7f8f07c145170f2bdd2c81c40192b216bb
tree	4aa301889e07ed4ed9a34d66ed787c452f002092	tree \| snapshot
parent	f17de73d0cbedad35501669d12bd6cf50bcc9d06	commit \| diff
parent	f9eb68bd354e67f9e86921168573f6e873843c87	commit \| diff

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

Conflicts:
bin/ebuild-helpers/emake
pym/_emerge/EbuildBuild.py
pym/_emerge/EbuildFetcher.py

14 files changed:

bin/ebuild	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/emake	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/Package.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.py	diff1 \|	diff2 \|	blob \| history
pym/portage/__init__.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/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

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