From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 29 Aug 2010 10:59:53 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=b6af41a572eb83e73875b1f8d450405fbee8eb0a

Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
	make.sh
---

b6af41a572eb83e73875b1f8d450405fbee8eb0a
diff --cc make.sh
index 0b6e70e31,41ede31f4..4d4529ff4
--- a/make.sh
+++ 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