Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Aug 2010 10:59:53 +0000 (12:59 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Aug 2010 10:59:53 +0000 (12:59 +0200)
Conflicts:
config/rootfiles/core/40/filelists/files
make.sh

1  2 
config/rootfiles/common/initscripts
doc/packages-list.txt
lfs/initscripts
make.sh

Simple merge
Simple merge
diff --cc lfs/initscripts
Simple merge
diff --cc make.sh
index 0b6e70e312e3c866b7941863b077c2e6d7f07fab,41ede31f412279373afddd51d5d07727df927abd..4d4529ff446af456bb6228f8c0bab5db791aa5df
+++ b/make.sh
@@@ -644,7 -643,7 +644,8 @@@ buildipfire() 
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
 +  ipfiremake tcl
+   ipfiremake imspector
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild