test commit

diff --git a/.gitignore b/.gitignore
index ac6f4409bf8be051d0665c0743bf853f42579f25..853fd84a4e280293f81727c25057644c758cd2c0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 *.zip
 *.pbxproj
+*.xcuserdata
\ No newline at end of file

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index 33c768c343a36a119d058414cece3ec193b228e1..c66d96788102f0e4a9500af0cfe9d86725070fa0 100644 (file)
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -368,7 +368,7 @@
                        outputFiles = (
                                "$(TARGET_BUILD_DIR)/$(INPUT_FILE_BASE).o",
                        );
-                       script = "/usr/local/gfortran/bin/gfortran -g -m64 -c ${PROJECT_DIR}/${INPUT_FILE_NAME} -o ${TARGET_BUILD_DIR}/${INPUT_FILE_BASE}.o";
+                       script = "/usr/local/bin/gfortran -g -m64 -c ${PROJECT_DIR}/${INPUT_FILE_NAME} -o ${TARGET_BUILD_DIR}/${INPUT_FILE_BASE}.o";
                };
 /* End PBXBuildRule section */
 
@@ -2353,7 +2353,7 @@
                                GCC_OPTIMIZATION_LEVEL = 3;
                                "INSTALL_PATH[sdk=*]" = TARGET_BUILD_DIR;
                                PRODUCT_NAME = mothur;
-                               SDKROOT = macosx10.6;
+                               SDKROOT = macosx10.8;
                                SKIP_INSTALL = NO;
                        };
                        name = Debug;
@@ -2405,7 +2405,7 @@
                                        "-lncurses",
                                        "-lreadline",
                                );
-                               SDKROOT = macosx10.6;
+                               SDKROOT = macosx10.8;
                                SKIP_INSTALL = NO;
                                USER_HEADER_SEARCH_PATHS = "";
                        };
@@ -2421,8 +2421,8 @@
                                GCC_MODEL_TUNING = "";
                                GCC_OPTIMIZATION_LEVEL = 3;
                                GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "VERSION=\"\\\"1.28.0\\\"\"",
-                                       "RELEASE_DATE=\"\\\"11/2/2012\\\"\"",
+                                       "VERSION=\"\\\"1.29.2\\\"\"",
+                                       "RELEASE_DATE=\"\\\"2/12/2013\\\"\"",
                                );
                                GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -2443,7 +2443,7 @@
                                        "-lncurses",
                                        "-lreadline",
                                );
-                               SDKROOT = macosx10.6;
+                               SDKROOT = macosx10.8;
                                SKIP_INSTALL = NO;
                        };
                        name = Release;

diff --git a/makefile b/makefile
index d4035c8a82f24ea2fa3c231a887375160125ce9e..3ce1686327126b12c45afb51599b2e5a066e19aa 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,8 +15,8 @@ USEREADLINE ?= yes
 CYGWIN_BUILD ?= no
 USECOMPRESSION ?= no
 MOTHUR_FILES="\"Enter_your_default_path_here\""
-RELEASE_DATE = "\"1/23/2013\""
-VERSION = "\"1.29.1\""
+RELEASE_DATE = "\"2/12/2013\""
+VERSION = "\"1.29.2\""
 FORTAN_COMPILER = gfortran
 FORTRAN_FLAGS =