]> 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: f3d2db8 fdec431)
Merge branch 'next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Apr 2012 10:22:03 +0000 (12:22 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Apr 2012 10:22:03 +0000 (12:22 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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