Merge remote-tracking branch 'jlentfer/multicat' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 14 Jun 2013 11:12:47 +0000 (13:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 14 Jun 2013 11:12:47 +0000 (13:12 +0200)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -765,9 -765,8 +765,11 @@@ buildipfire() 
    ipfiremake nginx
    ipfiremake sendEmail
    ipfiremake sysbench
 +  ipfiremake strace
 +  ipfiremake ipfire-netboot
 +  ipfiremake lcdproc
+   ipfiremake bitstream
+   ipfiremake multicat
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild