]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 Sep 2009 10:38:32 +0000 (12:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 Sep 2009 10:38:32 +0000 (12:38 +0200)
1  2 
config/rootfiles/oldcore/30/filelists/files
config/rootfiles/oldcore/30/update.sh
doc/packages-list.txt
make.sh

Simple merge
Simple merge
diff --cc make.sh
Simple merge