Merge branch 'master' into 1.40.0

mothur · 7a5fb1b6765db0542d8e167e0c5e7a6464418e95 · mothur-westcott committed Feb 27, 2017 · Feb 27, 2017 · 7a5fb1b
2 parents fc5962f + 4c2c359
commit 7a5fb1b6765db0542d8e167e0c5e7a6464418e95
Unified Split

Showing with 10 additions and 10 deletions.

+2 −2 Makefile

+6 −6 Mothur.xcodeproj/project.pbxproj

+2 −2 makefile-internal
diff --git a/Makefile b/Makefile
@@ -15,8 +15,8 @@ USEBOOST ?= yes
 BOOST_LIBRARY_DIR="\"Enter_your_boost_library_path_here\""
 BOOST_INCLUDE_DIR="\"Enter_your_boost_include_path_here\""
 MOTHUR_FILES="\"Enter_your_default_path_here\""
-RELEASE_DATE = "\"2/2/2017\""
-VERSION = "\"1.39.1\""
+RELEASE_DATE = "\"2/23/2017\""
+VERSION = "\"1.39.3\""
 
 ifeq  ($(strip $(64BIT_VERSION)),yes)
     CXXFLAGS += -DBIT_VERSION
diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
@@ -3384,8 +3384,8 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"VERSION=\"\\\"1.39.2\\\"\"",
-					"RELEASE_DATE=\"\\\"2/16/2017\\\"\"",
+					"VERSION=\"\\\"1.39.3\\\"\"",
+					"RELEASE_DATE=\"\\\"2/23/2017\\\"\"",
 					"MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
 				);
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
@@ -3419,8 +3419,8 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"VERSION=\"\\\"1.39.2\\\"\"",
-					"RELEASE_DATE=\"\\\"2/16/2017\\\"\"",
+					"VERSION=\"\\\"1.39.3\\\"\"",
+					"RELEASE_DATE=\"\\\"2/23/2017\\\"\"",
 					"MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
 				);
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
@@ -3505,8 +3505,8 @@
 				GCC_MODEL_TUNING = "";
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"VERSION=\"\\\"1.39.2\\\"\"",
-					"RELEASE_DATE=\"\\\"2/16/2017\\\"\"",
+					"VERSION=\"\\\"1.39.3\\\"\"",
+					"RELEASE_DATE=\"\\\"2/23/2017\\\"\"",
 					"MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
 				);
 				GCC_VERSION = "";
diff --git a/makefile-internal b/makefile-internal
@@ -1,8 +1,8 @@
 64BIT_VERSION ?= yes
 USEREADLINE ?= no
 USEBOOST ?= no
-RELEASE_DATE = "\"2/7/2017\""
-VERSION = "\"1.39.1\""
+RELEASE_DATE = "\"2/23/2017\""
+VERSION = "\"1.39.3\""
 
 # Optimize to level 3:
     CXXFLAGS += -O3