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

projects / portage.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8713a8b 4154588)

author	Fabian Groffen <grobian@gentoo.org>
	Sat, 20 Aug 2011 17:50:06 +0000 (19:50 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Sat, 20 Aug 2011 17:50:06 +0000 (19:50 +0200)
commit	7c8aa70f94de389fa452bbc8147de21a1e19a6cb
tree	d3be4dda674e940e191a882fa0c45d95bfb5e127	tree \| snapshot
parent	8713a8b8b1422a49867b0c909143c7b313263816	commit \| diff
parent	415458868f42c677a1a6518c1e8d52b6597c751c	commit \| diff

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

Conflicts:
pym/portage/elog/mod_save.py

16 files changed:

bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/egencache	diff1 \|	diff2 \|	blob \| history
bin/portageq	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Package.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/actions.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/main.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/vartree.py	diff1 \|	diff2 \|	blob \| history
pym/portage/elog/mod_save.py	diff1 \|	diff2 \|	blob \| history
pym/portage/elog/mod_save_summary.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/_config/special_env_vars.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
pym/portage/package/ebuild/prepare_build_dirs.py	diff1 \|	diff2 \|	blob \| history

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