]> 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: 5446289 ae69ea7)
Merge branch 'networking'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Mar 2009 20:58:20 +0000 (21:58 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Mar 2009 20:58:20 +0000 (21:58 +0100)
Conflicts:
src/rootfiles/core/initscripts

1  2 
lfs/initscripts patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history

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