]> git.ipfire.org Git - pakfire.git/commitdiff
projects / pakfire.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7763570 42cadd8)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 18 Mar 2011 16:26:48 +0000 (17:26 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 18 Mar 2011 16:26:48 +0000 (17:26 +0100)
1  2 
pakfire/constants.py patch | diff1 | diff2 | blob | history
pakfire/packages/make.py patch | diff1 | diff2 | blob | history

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