Merge branch 'master' of github.com:openscad/openscad

scripts/mingw-x-build-dependencies.sh

@@ -48,11 +48,7 @@ if [ ! -e $MXEDIR ]; then
 	mkdir -p $MXEDIR
 	cd $MXEDIR/..
 	echo "Downloading MXE into " $PWD
-	if [ "`echo $* | grep 64`" ]; then
-		git clone -b multi-rebase git://github.com/tonytheodore/mxe.git $MXEDIR
-	else
-		git clone git://github.com/mxe/mxe.git $MXEDIR
-	fi
+	git clone git://github.com/mxe/mxe.git $MXEDIR
 fi
 
 echo "entering" $MXEDIR

src/PlatformUtils.cc

@@ -84,7 +84,7 @@ std::string PlatformUtils::info()
 #ifdef QT_VERSION
 	std::string qtVersion = qVersion();
 #else
-	std::string qtVersion = "Qt disabled";
+	std::string qtVersion = "Qt disabled - Commandline Test Version";
 #endif
 
 #ifdef ENABLE_CGAL