]> 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: 71af184 5b6fdbf)
Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 14 May 2012 08:40:15 +0000 (10:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 14 May 2012 08:40:15 +0000 (10:40 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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