]> 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: 7b321c2 25fadf9)
Merge branch 'next' into arm-port
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Sep 2011 11:36:14 +0000 (13:36 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Sep 2011 11:36:14 +0000 (13:36 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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