Merge remote-tracking branch 'mothur/master'

diff --combined Mothur.xcodeproj/project.pbxproj
index 32471ebef92d91e4af0a1aa87a0c75c229712236,f37c56d3e59bf3d010397ad6c1262c1071adc1ff..3c14d55163ab260db87b7a35c271e664b7584945
--- 1/Mothur.xcodeproj/project.pbxproj
--- 2/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@@ -1730,11 -1730,11 +1730,11 @@@
                                A7E9B66512D37EC400DA6239 /* blastdb.hpp */,
                                A74D59A6159A1E3600043046 /* counttable.h */,
                                A74D59A3159A1E2000043046 /* counttable.cpp */,
-                               A7E9B6CD12D37EC400DA6239 /* distancedb.cpp */,
                                A7E9B6BD12D37EC400DA6239 /* database.cpp */,
                                A7E9B6BE12D37EC400DA6239 /* database.hpp */,
                                A7E9B6BF12D37EC400DA6239 /* datavector.hpp */,
                                A7E9B6CE12D37EC400DA6239 /* distancedb.hpp */,
+                               A7E9B6CD12D37EC400DA6239 /* distancedb.cpp */,
                                A7E9B6DE12D37EC400DA6239 /* fastamap.cpp */,
                                A7E9B6DF12D37EC400DA6239 /* fastamap.h */,
                                A7E9B6E812D37EC400DA6239 /* flowdata.h */,
@@@ -1958,7 -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,6 +2353,7 @@@
                                GCC_OPTIMIZATION_LEVEL = 3;
                                "INSTALL_PATH[sdk=*]" = TARGET_BUILD_DIR;
                                PRODUCT_NAME = mothur;
 +                              SDKROOT = macosx;
                                SDKROOT = macosx10.8;
                                SKIP_INSTALL = NO;
                        };
@@@ -2370,7 -2369,6 +2370,7 @@@
                                GCC_OPTIMIZATION_LEVEL = 3;
                                GCC_WARN_UNUSED_VALUE = YES;
                                PRODUCT_NAME = mothur;
 +                              SDKROOT = macosx;
                                SKIP_INSTALL = NO;
                        };
                        name = Release;
@@@ -2386,9 -2384,9 +2386,9 @@@
                                GCC_ENABLE_SSE42_EXTENSIONS = NO;
                                GCC_OPTIMIZATION_LEVEL = 3;
                                GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "MOTHUR_FILES=\"\\\"../release\\\"\"",
-                                       "VERSION=\"\\\"1.28.0\\\"\"",
-                                       "RELEASE_DATE=\"\\\"11/2/2012\\\"\"",
+                                       "MOTHUR_FILES=\"\\\"../../release\\\"\"",
+                                       "VERSION=\"\\\"1.29.2\\\"\"",
+                                       "RELEASE_DATE=\"\\\"2/12/2013\\\"\"",
                                );
                                "GCC_VERSION[arch=*]" = "";
                                GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@@ -2407,7 -2405,7 +2407,7 @@@
                                        "-lncurses",
                                        "-lreadline",
                                );
 -                              SDKROOT = macosx10.8;
 +                              SDKROOT = macosx;
                                SKIP_INSTALL = NO;
                                USER_HEADER_SEARCH_PATHS = "";
                        };
@@@ -2445,7 -2443,7 +2445,7 @@@
                                        "-lncurses",
                                        "-lreadline",
                                );
 -                              SDKROOT = macosx10.8;
 +                              SDKROOT = macosx;
                                SKIP_INSTALL = NO;
                        };
                        name = Release;