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

projects / portage.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ebe76c4 ebb1730)

author	Fabian Groffen <grobian@gentoo.org>
	Fri, 1 Jul 2011 17:42:16 +0000 (19:42 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Fri, 1 Jul 2011 17:42:16 +0000 (19:42 +0200)
commit	1683b8f2933a2e23785ae2e7e3b23eec831f9d93
tree	0c5568656a8c16aa3400c2ec88d9a75ef5ed86d4	tree \| snapshot
parent	ebe76c40c60e1938493e87a4e690cc2615ebba79	commit \| diff
parent	ebb17308212806e44468f520268b3d1441133065	commit \| diff

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

Conflicts:
pym/portage/package/ebuild/prepare_build_dirs.py
pym/portage/util/__init__.py

18 files changed:

bin/ebuild	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/ecompress	diff1 \|	diff2 \|	blob \| history
bin/emaint	diff1 \|	diff2 \|	blob \| history
bin/misc-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/portageq	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
cnf/make.globals	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Package.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.py	diff1 \|	diff2 \|	blob \| history
pym/portage/const.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/vartree.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/prepare_build_dirs.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/_dyn_libs/LinkageMapELF.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/env_update.py	diff1 \|	diff2 \|	blob \| history

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