]> 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: 9d3616d 7b6d7c6)
Merge remote-tracking branch 'origin/seventeen' into kernel-test-next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 31 Oct 2014 16:32:58 +0000 (17:32 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 31 Oct 2014 16:32:58 +0000 (17:32 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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