]> 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: 2997fa1 1b04fe0)
Merge remote branch 'stevee/updates' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Jul 2010 19:05:48 +0000 (21:05 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Jul 2010 19:05:48 +0000 (21:05 +0200)
Conflicts:
pkgs/core/pcre/pcre.nm

1  2 
pkgs/core/libpng/libpng.nm patch | diff1 | diff2 | blob | history

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