projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8211c4 38becff)
Merge remote branch 'ms/arm-port' into arm-port
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Sep 2011 00:16:24 +0000 (02:16 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Sep 2011 00:16:24 +0000 (02:16 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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