projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06b912c f0f385d)
Merge branch 'master' into ppp-update
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jun 2010 09:36:50 +0000 (11:36 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jun 2010 09:36:50 +0000 (11:36 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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