]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/commitdiff
projects / people / dweismueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0eb52d 9306852)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 22 Feb 2015 22:44:39 +0000 (23:44 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 22 Feb 2015 22:44:39 +0000 (23:44 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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