]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79df3f7 9457156)
Merge branch 'master' into upnp
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 23 Nov 2010 21:14:08 +0000 (22:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 23 Nov 2010 21:14:08 +0000 (22:14 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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