From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 5 Jul 2010 20:53:47 +0000 (+0200)
Subject: Merge commit 'ms/minicom'
X-Git-Tag: v2.9-beta1~171^2~8^2~6
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e63ca421f9a7ea76ee9b8561b81613e429a4009e;hp=-c

Merge commit 'ms/minicom'
---

e63ca421f9a7ea76ee9b8561b81613e429a4009e
diff --combined make.sh
index 574f9f25ca,5702de8c01..c0169a30f6
--- a/make.sh
+++ b/make.sh
@@@ -625,7 -625,7 +625,7 @@@ buildipfire() 
    ipfiremake perl-DBD-mysql
    ipfiremake cacti
    ipfiremake icecc
 -  ipfiremake open-vm-tools
 +  ipfiremake openvmtools
    ipfiremake nagiosql
    ipfiremake iftop
    ipfiremake motion
@@@ -641,6 -641,7 +641,7 @@@
    ipfiremake mdadm
    ipfiremake eject
    ipfiremake pound
+   ipfiremake minicom
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild