]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c9b2d9 61466ab)
Merge branch 'master' into kernel-test
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 07:22:42 +0000 (09:22 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 07:22:42 +0000 (09:22 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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