]> git.ipfire.org Git - pakfire.git/commitdiff
projects / pakfire.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6bd96b 25a9863)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Feb 2012 11:39:39 +0000 (12:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Feb 2012 11:39:39 +0000 (12:39 +0100)
Conflicts:
po/pakfire.pot

1  2 
python/pakfire/cli.py patch | diff1 | diff2 | blob | history

diff --cc python/pakfire/cli.py
Simple merge
Pakfire is the package management and build system for IPFire 3.x.