projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d528f3 7362887)
Merge branch 'beyond-next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 Jun 2013 10:32:08 +0000 (12:32 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 Jun 2013 10:32:08 +0000 (12:32 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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