]> 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: e63ca42 0b83e5a)
Merge commit 'ms/ppp-update'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Jul 2010 20:53:59 +0000 (22:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Jul 2010 20:53:59 +0000 (22:53 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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