]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 901aa8b 69460bb)
Merge branch 'next' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Oct 2013 12:12:12 +0000 (13:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Oct 2013 12:12:12 +0000 (13:12 +0100)
1  2 
lfs/strongswan patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history

diff --cc lfs/strongswan
Simple merge
diff --cc make.sh
Simple merge
Peter's tree of IPFire 2.x