projects / portage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e502f78 6ef9ca0)
Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 1 Nov 2010 17:35:55 +0000 (18:35 +0100)
committerFabian Groffen <grobian@gentoo.org>
Mon, 1 Nov 2010 17:35:55 +0000 (18:35 +0100)
1  2 
bin/misc-functions.sh patch | diff1 | diff2 | blob | history
pym/portage/util/__init__.py patch | diff1 | diff2 | blob | history

diff --cc bin/misc-functions.sh
index 1dc0f0a2b42609a98beb5d84e800006602c1a1ce,79ce4362883b990b8fd1e0a78d309e9632d67721..3840db6b583ca4e656ca9a990a74f4d2f8c73be9
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
diff --cc pym/portage/util/__init__.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.