]> 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: 8fb6ecd fa0bb39)
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:17:10 +0000 (21:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:17:10 +0000 (21:17 +0200)
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