Merge remote-tracking branch 'erik/sendEmail' into core67-merge
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:42:22 +0000 (13:42 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:42:22 +0000 (13:42 +0100)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -753,7 -776,7 +754,8 @@@ buildipfire() 
    ipfiremake stress
    ipfiremake libstatgrab
    ipfiremake sarg
 +  ipfiremake fstrim
+   ipfiremake sendEmail
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild