]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb57195 beb394a)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Feb 2011 19:49:32 +0000 (20:49 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Feb 2011 19:49:32 +0000 (20:49 +0100)
Conflicts:
pkgs/ppl/patches/ppl-0.10.2-Makefile.patch
pkgs/ppl/patches/ppl-0.10.2-gmp-build-fix.patch
pkgs/ppl/patches/ppl-0.10.2-m4-update.patch

1  2 
pkgs/cryptsetup-luks/cryptsetup-luks.nm patch | diff1 | diff2 | blob | history
pkgs/ppl/ppl.nm patch | diff1 | diff2 | blob | history

diff --cc pkgs/ppl/ppl.nm
Simple merge
IPFire 3.x development tree