]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8089b78 41dfa08)
Merge branch 'beyond-next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Mar 2014 23:21:33 +0000 (00:21 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Mar 2014 23:21:33 +0000 (00:21 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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