]> git.ipfire.org Git - pakfire.git/commitdiff
projects / pakfire.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ad59b6 d516668)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Mar 2012 17:47:17 +0000 (18:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Mar 2012 17:47:17 +0000 (18:47 +0100)
Conflicts:
python/pakfire/transaction.py


Trivial merge
Pakfire is the package management and build system for IPFire 3.x.