]> 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: 1453ab9 b58ee4b)
Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Dec 2008 00:48:53 +0000 (01:48 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Dec 2008 00:48:53 +0000 (01:48 +0100)
1  2 
lfs/Config patch | diff1 | diff2 | blob | history

diff --cc lfs/Config
Simple merge
IPFire 3.x development tree