]> 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: 085d997 e43b212)
Merge remote-tracking branch 'origin/master' into kernel-test
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Oct 2014 08:11:13 +0000 (10:11 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Oct 2014 08:11:13 +0000 (10:11 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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