From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 11 Aug 2013 11:32:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'ummeegge/wavemon' into next
X-Git-Tag: v2.13-core73~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ff0db36c130cced27b667ac6b8ef8d423882380;p=ipfire-2.x.git

Merge remote-tracking branch 'ummeegge/wavemon' into next

Conflicts:
	make.sh
---

9ff0db36c130cced27b667ac6b8ef8d423882380
diff --cc make.sh
index 7b63bd464f,9c7532a8d6..538151ccd1
--- a/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