]> git.ipfire.org Git - people/stevee/pakfire.git/commitdiff
projects / people / stevee / pakfire.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08de930 ce5f16e)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 Nov 2011 11:22:43 +0000 (12:22 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 Nov 2011 11:22:43 +0000 (12:22 +0100)
1  2 
python/pakfire/config.py patch | diff1 | diff2 | blob | history

diff --cc python/pakfire/config.py
Simple merge
Stefan's tree of pakfire.