]> 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: 0239bce 48f989d)
Merge remote-tracking branch 'origin/master' into kernel-test
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Aug 2014 15:07:26 +0000 (17:07 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Aug 2014 15:07:26 +0000 (17:07 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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