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

projects / portage.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2c30998 6b604d4)

author	Fabian Groffen <grobian@gentoo.org>
	Wed, 9 Mar 2011 19:42:08 +0000 (20:42 +0100)
committer	Fabian Groffen <grobian@gentoo.org>
	Wed, 9 Mar 2011 19:42:08 +0000 (20:42 +0100)
commit	5fe6f8c536460d74097aa1b10eeffe115382fa03
tree	76e05a7aaa93de5550f8bd01899e4a367617be42	tree \| snapshot
parent	2c30998a168fbb2f0ebca7d5e409be000793e816	commit \| diff
parent	6b604d43c68cab45ea5668042a53c23d4012bb18	commit \| diff

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

Conflicts:
bin/ebuild-helpers/dodoc

bin/ebuild	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/dodoc	diff1 \|	diff2 \|	blob \| history
pym/_emerge/actions.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.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/util/__init__.py	diff1 \|	diff2 \|	blob \| history

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