]> 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: 47f7b18 332600a)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 13 Apr 2012 15:47:26 +0000 (17:47 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 13 Apr 2012 15:47:26 +0000 (17:47 +0200)
1  2 
python/pakfire/builder.py patch | diff1 | diff2 | blob | history

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