Merge remote-tracking branch 'ummeegge/wavemon' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Aug 2013 11:32:51 +0000 (13:32 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Aug 2013 11:32:51 +0000 (13:32 +0200)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -780,8 -779,7 +780,9 @@@ buildipfire() 
    ipfiremake perl-File-Tail
    ipfiremake perl-TimeDate
    ipfiremake swatch
 +  ipfiremake tor
 +  ipfiremake arm
+   ipfiremake wavemon
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild