From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Nov 2010 14:39:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~48^2~5
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=514bee894cc0c0825fb874689d3e245d3fdaf1de

Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
	make.sh
---

514bee894cc0c0825fb874689d3e245d3fdaf1de
diff --cc config/rootfiles/core/43/filelists/files
index 995b690700,eb3c9517ec..49c6586bb6
--- a/config/rootfiles/core/43/filelists/files
+++ b/config/rootfiles/core/43/filelists/files
@@@ -1,2 -1,11 +1,12 @@@
 +etc/init.d/firewall
  etc/system-release
+ etc/rc.d/init.d/checkfs
+ etc/rc.d/init.d/checkfstab
+ etc/rc.d/init.d/squid
+ srv/web/ipfire/cgi-bin/proxy.cgi
+ srv/web/ipfire/cgi-bin/speed.cgi
+ srv/web/ipfire/cgi-bin/vpnmain.cgi
+ srv/web/ipfire/html/images/urlfilter/copy.gif
+ var/ipfire/general-functions.pl
+ usr/local/bin/rebuild-initrd
+ usr/bin/ldd
diff --cc make.sh
index fa13d0d796,d9abd2a474..a3671e9e5a
--- a/make.sh
+++ b/make.sh
@@@ -658,8 -678,9 +678,10 @@@ buildipfire() 
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
+   ipfiremake tcl
    ipfiremake imspector
 +  ipfiremake miniupnpd
+   ipfiremake client175
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild