]> 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: 9457156 9d80adf)
Merge commit 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 27 Nov 2010 00:18:29 +0000 (01:18 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 27 Nov 2010 00:18:29 +0000 (01:18 +0100)
Conflicts:
make.sh

1  2 
make.sh patch | diff1 | diff2 | blob | history

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