]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commit
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)
commit3d61530e65f89028b6711ab06bb2f3d9fd08e305
treeb7962b90874c7014d3f6f78e90b8e488ab4ab22a
parenteb571950e254f675f9f39c8564ec4b699b01eae4
parentbeb394aee6f65ecba65b1796286b5e3bd3df6691
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

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
pkgs/cryptsetup-luks/cryptsetup-luks.nm
pkgs/ppl/ppl.nm