From ca72a5ab5d08058e0c4786d6ebbe9da5d9e9c8bc Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Tue, 10 Mar 2015 10:46:46 -0400
Subject: [PATCH] Reverted version to master after release

---
 openscad.pro               | 2 --
 scripts/publish-macosx.sh  | 2 --
 scripts/publish-mingw-x.sh | 2 +-
 scripts/release-common.sh  | 4 ++--
 tests/CMakeLists.txt       | 3 +--
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/openscad.pro b/openscad.pro
index c7bd60fe..aca3a809 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -39,8 +39,6 @@ isEmpty(QT_VERSION) {
   }
 }
 
-VERSION = 2015.03
-VERSIONDATE = 2015.03.06
 # If VERSION is not set, populate VERSION, VERSION_YEAR, VERSION_MONTH from system date
 include(version.pri)
 
diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh
index 7c3e970c..db3e0627 100755
--- a/scripts/publish-macosx.sh
+++ b/scripts/publish-macosx.sh
@@ -3,8 +3,6 @@
 # Usage:
 #   ./scripts/publish-macosx.sh [buildonly]
 #
-VERSION=2015.03
-VERSIONDATE=2015.03.06
 
 export NUMCPU=$(sysctl -n hw.ncpu)
 
diff --git a/scripts/publish-mingw-x.sh b/scripts/publish-mingw-x.sh
index 96887cf0..ce27f8ee 100755
--- a/scripts/publish-mingw-x.sh
+++ b/scripts/publish-mingw-x.sh
@@ -4,7 +4,7 @@
 #
 
 if test -z "$VERSION"; then
-  VERSION=2015.03
+  VERSION=`date "+%Y.%m.%d"`
   COMMIT=-c
 fi
 
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index bc4d5610..cb96a9c1 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -110,10 +110,10 @@ do
 done
 
 if test -z "$VERSIONDATE"; then
-    VERSIONDATE=2015.03.06
+    VERSIONDATE=`date "+%Y.%m.%d"`
 fi
 if test -z "$VERSION"; then
-    VERSION=2015.03
+    VERSION=$VERSIONDATE
 fi
 
 export VERSIONDATE
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 496fc335..3003dd89 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -571,13 +571,12 @@ include_directories(../src ../src/libtess2/Include)
 
 # Handle OpenSCAD version based on VERSION env. variable.
 # Use current timestamp if not specified (development builds)
-set(ENV{VERSION} "2015.03")
 if ("$ENV{VERSION}" STREQUAL "")
   # Timestamp is only available in cmake >= 2.8.11  
   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.10)
     string(TIMESTAMP VERSION "%Y.%m.%d")
   else()
-    set(VERSION "2015.03")
+    set(VERSION "2013.06")
   endif()
 else()
   set(VERSION $ENV{VERSION})