]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6af41a 4247f58)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Aug 2010 19:40:55 +0000 (21:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Aug 2010 19:40:55 +0000 (21:40 +0200)
Conflicts:
config/rootfiles/core/40/filelists/files

1  2 
config/rootfiles/common/initscripts patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/common/initscripts
Simple merge
IPFire 2.x development tree