merged from master, another royal mess that git really didn't do a very good job of handling

This commit is contained in:
Paul Davis 2013-04-02 11:28:18 -04:00
parent 55c59504ca
commit cfafa7bf83
81 changed files with 8778 additions and 229 deletions

View file

@ -11,11 +11,7 @@ fi
cd $BASE || exit 1
svn update || exit 1
<<<<<<< HEAD
./waf configure --strict --noconfirm --also-libdir=$HOME/a3/inst/lib --also-include=$HOME/gtk/inst/include || exit 1
=======
./waf configure $* --strict --noconfirm --also-libdir=$HOME/a3/inst/lib --also-include=$HOME/gtk/inst/include || exit 1
>>>>>>> master
./waf || exit 1
cd tools/linux_packaging || exit 1
./build --public --strip some || exit 1