]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8706303 bf8416a)
Merge branch 'master' into perl_5.12.2
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 Feb 2011 16:37:07 +0000 (17:37 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 Feb 2011 16:37:07 +0000 (17:37 +0100)
Conflicts:
config/rootfiles/core/47/filelists/files
config/rootfiles/core/47/update.sh

1  2 
config/rootfiles/core/46/update.sh patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/core/46/update.sh
Simple merge
Timo's tree of IPFire 2.x