]> 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: 715d700 c64002f)
Merge branch 'master' of git://git.ipfire.org/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 21 May 2011 19:59:09 +0000 (19:59 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 21 May 2011 19:59:09 +0000 (19:59 +0000)
1  2 
pakfire/base.py patch | diff1 | diff2 | blob | history
pakfire/cli.py patch | diff1 | diff2 | blob | history

diff --cc pakfire/base.py
Simple merge
diff --cc pakfire/cli.py
Simple merge
Stefan's tree of pakfire.