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

projects / portage.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e976f28 8bb3ef1)

author	Fabian Groffen <grobian@gentoo.org>
	Wed, 15 Sep 2010 17:07:00 +0000 (19:07 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Wed, 15 Sep 2010 17:07:00 +0000 (19:07 +0200)
commit	6f649810de7923b70e715aa39f3bca08d51d2d59
tree	482ed12d195f79597cc79cb67f037a9db35c4a8c	tree \| snapshot
parent	e976f28f6068dd9a470e76c92f797fc68a8e49b0	commit \| diff
parent	8bb3ef148772b6c3cfdbe88807779871d38700b7	commit \| diff

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

Conflicts:
bin/ebuild.sh
bin/misc-functions.sh
bin/repoman
pym/_emerge/main.py

19 files changed:

bin/ebuild-ipc.py	diff1 \|	diff2 \|	blob \| history
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/EbuildBuild.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/EbuildBuildDir.py	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/_sets/profiles.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/fetch.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	diff1 \|	diff2 \|	blob \| history

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