projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72417e2 d154ab5)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 1 Aug 2013 16:24:03 +0000 (18:24 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 1 Aug 2013 16:24:03 +0000 (18:24 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
Timo's tree of IPFire 2.x