projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c375868 3a3940b)
Merge branch 'master' into upnp
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Nov 2010 12:23:00 +0000 (13:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Nov 2010 12:23:00 +0000 (13:23 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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