]> git.ipfire.org Git - people/ms/pakfire.git/commitdiff
projects / people / ms / pakfire.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b72b666 b44d71c)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Sep 2013 10:52:43 +0000 (12:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Sep 2013 10:52:43 +0000 (12:52 +0200)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
Pakfire is the package management and build system for IPFire 3.x.