diff options
| author | Marius Kintel <marius@kintel.net> | 2013-11-24 01:00:22 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-11-24 01:00:22 (GMT) |
| commit | 20eba5782945733e43977b6f4105f58c3f7af8ac (patch) | |
| tree | 98e6f12979276a6582db0ae6c3cfc74902ecc24d | |
| parent | 7b526bc27ab70f362332640987bc3f8c363b3659 (diff) | |
| parent | b204aba444bd838bd3fe27675323dce6d4123b19 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
| -rwxr-xr-x | scripts/mingw-x-build-dependencies.sh | 6 | ||||
| -rw-r--r-- | src/PlatformUtils.cc | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index e9f124b..df8572f 100755 --- a/scripts/mingw-x-build-dependencies.sh +++ b/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 diff --git a/src/PlatformUtils.cc b/src/PlatformUtils.cc index cfa5731..b02b822 100644 --- a/src/PlatformUtils.cc +++ b/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 |