Merge remote-tracking branch 'mothur/master'

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index c66d96788102f0e4a9500af0cfe9d86725070fa0..600f6d701955db37eaf0e362a4406ec501bdfcf1 100644 (file)
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -1958,7 +1958,7 @@
                08FB7793FE84155DC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
-                               LastUpgradeCheck = 0420;
+                               LastUpgradeCheck = 0460;
                                ORGANIZATIONNAME = "Schloss Lab";
                        };
                        buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "Mothur" */;
@@ -2353,7 +2353,7 @@
                                GCC_OPTIMIZATION_LEVEL = 3;
                                "INSTALL_PATH[sdk=*]" = TARGET_BUILD_DIR;
                                PRODUCT_NAME = mothur;
-                               SDKROOT = macosx10.8;
+                               SDKROOT = macosx;
                                SKIP_INSTALL = NO;
                        };
                        name = Debug;
@@ -2369,6 +2369,7 @@
                                GCC_OPTIMIZATION_LEVEL = 3;
                                GCC_WARN_UNUSED_VALUE = YES;
                                PRODUCT_NAME = mothur;
+                               SDKROOT = macosx;
                                SKIP_INSTALL = NO;
                        };
                        name = Release;
@@ -2405,7 +2406,7 @@
                                        "-lncurses",
                                        "-lreadline",
                                );
-                               SDKROOT = macosx10.8;
+                               SDKROOT = macosx;
                                SKIP_INSTALL = NO;
                                USER_HEADER_SEARCH_PATHS = "";
                        };
@@ -2443,7 +2444,7 @@
                                        "-lncurses",
                                        "-lreadline",
                                );
-                               SDKROOT = macosx10.8;
+                               SDKROOT = macosx;
                                SKIP_INSTALL = NO;
                        };
                        name = Release;

diff --git a/command.hpp b/command.hpp
index 48dcf283c8874c8168ac6cf48748bf80851caef3..37186529ab1f75e5747138d74f976c5df3c1bbe9 100644 (file)
--- a/command.hpp
+++ b/command.hpp
@@ -3,7 +3,7 @@
 //test2
 /*
  *  command.h
- *  
+ *  nast
  *
  *  Created by Pat Schloss on 10/23/08.
  *  Copyright 2008 Patrick D. Schloss. All rights reserved.