Merge remote-tracking branch 'dweismueller/telnet' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Sep 2012 17:10:23 +0000 (19:10 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Sep 2012 17:10:23 +0000 (19:10 +0200)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -769,8 -767,7 +769,9 @@@ buildipfire() 
    ipfiremake lcd4linux
    ipfiremake mtr
    ipfiremake tcpick
 +  ipfiremake minidlna
 +  ipfiremake fping
+   ipfiremake telnet
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild