]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98be046 30abdf0)
Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 29 Jun 2008 20:30:00 +0000 (22:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 29 Jun 2008 20:30:00 +0000 (22:30 +0200)
Conflicts:

tools/make-include

1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
Michael's tree of IPFire 3.x.