Ok back to doing this correctly

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@813 d0543943-73ff-0310-b7d9-9358b9ac24b2

freeswitch.xcodeproj/brian.mode1

@@ -260,13 +260,24 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
 							<array>
 								<string>D3A7637E09BEAAEE002E9B53</string>
+								<string>D30F70DB09BF6E9D00A494C4</string>
+								<string>D30F70DC09BF6EA800A494C4</string>
 								<string>1C37FBAC04509CD000000102</string>
+<<<<<<< .mine
+								<string>D30F712C09BF75AC00A494C4</string>
+								<string>D30F712D09BF75AC00A494C4</string>
+=======
 								<string>D3C7A96609BF6AA5009127A4</string>
+>>>>>>> .r812
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
+<<<<<<< .mine
+									<integer>39</integer>
+=======
 									<integer>6</integer>
+>>>>>>> .r812
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
@@ -370,9 +381,17 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
+<<<<<<< .mine
+				<string>D30F711A09BF728500A494C4</string>
+=======
 				<string>D3C7A95109BF69FC009127A4</string>
+>>>>>>> .r812
 				<string>1CE0B1FE06471DED0097A5F4</string>
+<<<<<<< .mine
+				<string>D30F711B09BF728500A494C4</string>
+=======
 				<string>D3C7A95209BF69FC009127A4</string>
+>>>>>>> .r812
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -590,7 +609,11 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>D3A763A109BEAC72002E9B53</string>
+<<<<<<< .mine
+				<string>D30F711C09BF728600A494C4</string>
+=======
 				<string>D3C7A95309BF69FC009127A4</string>
+>>>>>>> .r812
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -960,9 +983,17 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C0AD2B3069F1EA900FABCE6</string>
+<<<<<<< .mine
+				<string>D30F712409BF745A00A494C4</string>
+=======
 				<string>D3C7A95409BF69FC009127A4</string>
+>>>>>>> .r812
 				<string>1CD0528B0623707200166675</string>
+<<<<<<< .mine
+				<string>D30F712509BF745A00A494C4</string>
+=======
 				<string>D3C7A95509BF69FC009127A4</string>
+>>>>>>> .r812
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.run</string>

freeswitch.xcodeproj/brian.pbxuser

 // !$*UTF8*$!
 {
+<<<<<<< .mine
+	D30F70E109BF6ECA00A494C4 /* mod_echo.dylib */ = {
+		activeExec = 0;
+	};
+	D31D4A4A09BEBF01001112B8 /* libapr.dylib */ = {
+		activeExec = 0;
+=======
 	D31D503409BECA2B001112B8 /* switch_console.c */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1011, 2464}}";
 			sepNavSelRange = "{4693, 0}";
 			sepNavVisRect = "{{0, 0}, {1011, 264}}";
 		};
+>>>>>>> .r812
 	};
 	D31D503509BECA2B001112B8 /* switch_core.c */ = {
 		uiCtxt = {
@@ -98,6 +106,10 @@
 		activeExecutable = D31D509109BECBA3001112B8 /* freeswitch */;
 		activeTarget = D3A763FE09BEB271002E9B53 /* All */;
 		addToTargets = (
+<<<<<<< .mine
+			D30F70E109BF6ECA00A494C4 /* mod_echo.dylib */,
+=======
+>>>>>>> .r812
 		);
 		breakpoints = (
 		);
@@ -184,7 +196,7 @@
 				PBXFileTableDataSourceColumnSortingKey = PBXFindDataSource_LocationID;
 				PBXFileTableDataSourceColumnWidthsKey = (
 					200,
-					120,
+					876,
 				);
 				PBXFileTableDataSourceColumnsKey = (
 					PBXFindDataSource_MessageID,
@@ -253,8 +265,13 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
+<<<<<<< .mine
+			PBXPerProjectTemplateStateSaveDate = 163541522;
+			PBXWorkspaceStateSaveDate = 163541522;
+=======
 			PBXPerProjectTemplateStateSaveDate = 163539282;
 			PBXWorkspaceStateSaveDate = 163539282;
+>>>>>>> .r812
 		};
 		sourceControlManager = D3A7638409BEAAEE002E9B53 /* Source Control */;
 		userBuildSettings = {