]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e18c5b3 9b95d68)
Merge branch 'kernel-update' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into...
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 10 Mar 2012 17:21:44 +0000 (18:21 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 10 Mar 2012 17:21:44 +0000 (18:21 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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