X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=Mothur.xcodeproj%2Fproject.pbxproj;h=80b05db9c02288a1c91fb0085c13426774d06fc7;hp=f0a56a370af8b2584d46caf6cdb97bd155a30efa;hb=d1faab5efe1c28700890bdec5b4d8e817fa1dab2;hpb=0c5f99d1282405e20458e2822aa1a54774d2fa83

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index f0a56a3..80b05db 100644
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		219C1DE01552C4BD004209F9 /* newcommandtemplate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 219C1DDF1552C4BD004209F9 /* newcommandtemplate.cpp */; };
 		219C1DE41559BCCF004209F9 /* getcoremicrobiomecommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 219C1DE31559BCCD004209F9 /* getcoremicrobiomecommand.cpp */; };
 		483C952E188F0CAD0035E7B7 /* sharedrjsd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 483C952D188F0CAD0035E7B7 /* sharedrjsd.cpp */; };
+		48E981CF189C38FB0042BE9D /* mergesfffilecommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48E981CE189C38FB0042BE9D /* mergesfffilecommand.cpp */; };
 		7E6BE10A12F710D8007ADDBE /* refchimeratest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E6BE10912F710D8007ADDBE /* refchimeratest.cpp */; };
 		834D9D581656D7C400E7FAB9 /* regularizedrandomforest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 834D9D561656D7C400E7FAB9 /* regularizedrandomforest.cpp */; };
 		834D9D5C1656DEC800E7FAB9 /* regularizeddecisiontree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 834D9D5A1656DEC700E7FAB9 /* regularizeddecisiontree.cpp */; };
@@ -409,6 +410,8 @@
 		219C1DE51559BCF2004209F9 /* getcoremicrobiomecommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getcoremicrobiomecommand.h; sourceTree = "<group>"; };
 		483C952C188F0C960035E7B7 /* sharedrjsd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sharedrjsd.h; sourceTree = "<group>"; };
 		483C952D188F0CAD0035E7B7 /* sharedrjsd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sharedrjsd.cpp; sourceTree = "<group>"; };
+		48E981CD189C38E60042BE9D /* mergesfffilecommand.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mergesfffilecommand.h; sourceTree = "<group>"; };
+		48E981CE189C38FB0042BE9D /* mergesfffilecommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mergesfffilecommand.cpp; sourceTree = "<group>"; };
 		7E6BE10812F710D8007ADDBE /* refchimeratest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = refchimeratest.h; sourceTree = "<group>"; };
 		7E6BE10912F710D8007ADDBE /* refchimeratest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = refchimeratest.cpp; sourceTree = "<group>"; };
 		7E78911B135F3E8600E725D2 /* eachgapdistignorens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eachgapdistignorens.h; sourceTree = "<group>"; };
@@ -1512,6 +1515,8 @@
 				A7E9B75312D37EC400DA6239 /* mergefilecommand.cpp */,
 				A71FE12A12EDF72400963CA7 /* mergegroupscommand.h */,
 				A71FE12B12EDF72400963CA7 /* mergegroupscommand.cpp */,
+				48E981CD189C38E60042BE9D /* mergesfffilecommand.h */,
+				48E981CE189C38FB0042BE9D /* mergesfffilecommand.cpp */,
 				A799314816CBD0BC0017E888 /* mergetaxsummarycommand.h */,
 				A799314A16CBD0CD0017E888 /* mergetaxsummarycommand.cpp */,
 				A7E9B75812D37EC400DA6239 /* metastatscommand.h */,
@@ -1718,6 +1723,7 @@
 				A7A09B0E18773BF700FAA081 /* shannonrange.h */,
 				A7A09B0F18773C0E00FAA081 /* shannonrange.cpp */,
 				A7E9B7E912D37EC400DA6239 /* sharedace.cpp */,
+				A7E9B7F412D37EC400DA6239 /* sharedjabund.cpp */,
 				A7E9B7EA12D37EC400DA6239 /* sharedace.h */,
 				A7E9B7EC12D37EC400DA6239 /* sharedanderbergs.cpp */,
 				A7E9B7ED12D37EC400DA6239 /* sharedanderbergs.h */,
@@ -1725,7 +1731,6 @@
 				A7E9B7EF12D37EC400DA6239 /* sharedbraycurtis.h */,
 				A7E9B7F012D37EC400DA6239 /* sharedchao1.cpp */,
 				A7E9B7F112D37EC400DA6239 /* sharedchao1.h */,
-				A7E9B7F412D37EC400DA6239 /* sharedjabund.cpp */,
 				A7E9B7F512D37EC400DA6239 /* sharedjabund.h */,
 				A7E9B7F612D37EC400DA6239 /* sharedjackknife.cpp */,
 				A7E9B7F712D37EC400DA6239 /* sharedjackknife.h */,
@@ -2102,6 +2107,7 @@
 				A7E9B89712D37EC400DA6239 /* chimerabellerophoncommand.cpp in Sources */,
 				A7E9B89812D37EC400DA6239 /* chimeraccodecommand.cpp in Sources */,
 				A7E9B89912D37EC400DA6239 /* chimeracheckcommand.cpp in Sources */,
+				48E981CF189C38FB0042BE9D /* mergesfffilecommand.cpp in Sources */,
 				A7E9B89A12D37EC400DA6239 /* chimeracheckrdp.cpp in Sources */,
 				A7E9B89B12D37EC400DA6239 /* chimerapintailcommand.cpp in Sources */,
 				A7E9B89C12D37EC400DA6239 /* chimerarealigner.cpp in Sources */,
@@ -2495,9 +2501,9 @@
 				GCC_ENABLE_SSE42_EXTENSIONS = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"MOTHUR_FILES=\"\\\"../../release\\\"\"",
-					"VERSION=\"\\\"1.32.0\\\"\"",
-					"RELEASE_DATE=\"\\\"10/31/2013\\\"\"",
+					"MOTHUR_FILES=\"\\\"/Users/sarahwestcott/desktop/release\\\"\"",
+					"VERSION=\"\\\"1.33.0\\\"\"",
+					"RELEASE_DATE=\"\\\"2/7/2014\\\"\"",
 				);
 				GCC_VERSION = "";
 				"GCC_VERSION[arch=*]" = "";