]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb679b1 8c1cf3b)
Merge branch 'bird' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 8 Mar 2016 22:45:04 +0000 (22:45 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 8 Mar 2016 22:45:04 +0000 (22:45 +0000)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
IPFire 2.x development tree