]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20c7883 682501e)
Merge branch 'squashinstall'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 28 Aug 2008 18:55:13 +0000 (20:55 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 28 Aug 2008 18:55:13 +0000 (20:55 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
IPFire 3.x development tree