]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
projects / people / mfischer / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0137fe 9bd0bfd)
Merge remote-tracking branch 'origin/next' into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Aug 2014 11:36:39 +0000 (13:36 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Aug 2014 11:36:39 +0000 (13:36 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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