Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Nov 2010 14:39:22 +0000 (15:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Nov 2010 14:39:22 +0000 (15:39 +0100)
Conflicts:
make.sh

1  2 
config/rootfiles/common/initscripts
config/rootfiles/core/43/filelists/files
make.sh

Simple merge
@@@ -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
+++ 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