]> 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: 31585f9 6863297)
Merge commit 'ms/arm-port' into arm-port
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 7 Sep 2011 13:04:28 +0000 (13:04 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 7 Sep 2011 13:04:28 +0000 (13:04 +0000)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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