]> 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: 58ca93c 0f18c30)
Merge remote-tracking branch 'origin/thirteen' into thirteen
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Oct 2012 08:59:50 +0000 (10:59 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Oct 2012 08:59:50 +0000 (10:59 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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