attempting to roll back to a working version

git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@375 c320cabd-cc23-0410-96d8-e60fbf53ed7f

build/Xcode/epanet/epanet.xcodeproj/project.pbxproj

@@ -221,7 +221,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB914E08733D8E0010E9CD /* Build configuration list for PBXProject "epanet" */;
 			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* epanet */;
 			projectDirPath = "";
 			projectRoot = ../../..;

build/Xcode/epanet/epanet.xcodeproj/sam.mode1v3

@@ -231,6 +231,8 @@
 			<key>Layout</key>
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -268,6 +270,7 @@
 								<string>08FB7794FE84155DC02AAC07</string>
 								<string>22322FA8106836A000641384</string>
 								<string>08FB7795FE84155DC02AAC07</string>
+								<string>1AB674ADFE9D54B511CA2CBB</string>
 								<string>1C37FBAC04509CD000000102</string>
 								<string>1C37FAAC04509CD000000102</string>
 								<string>1C37FABC05509CD000000102</string>
@@ -275,8 +278,8 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>25</integer>
+									<integer>28</integer>
-									<integer>4</integer>
+									<integer>26</integer>
 									<integer>0</integer>
 								</array>
 							</array>
@@ -311,14 +314,12 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>vars.h</string>
+								<string>epanet2.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -326,11 +327,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>vars.h</string>
+										<string>epanet2.h</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>22F948F711D1071600B08E7D</string>
+										<string>22663BCE12D60F65002E4167</string>
 										<key>history</key>
 										<array>
 											<string>22D84C7E106845A4006D3DEE</string>
@@ -339,7 +340,6 @@
 											<string>222BA1391180BE890071A4C7</string>
 											<string>222BA13B1180BE890071A4C7</string>
 											<string>22B1773E1199DED400A8EEC2</string>
-											<string>2270671A119B4A0C00BA4EF4</string>
 											<string>2270671C119B4A0C00BA4EF4</string>
 											<string>2211345511C189B0006B6918</string>
 											<string>223C3E2511C42F5800F60805</string>
@@ -354,12 +354,13 @@
 											<string>222BA21311C81765009CF8E3</string>
 											<string>222BA21411C81765009CF8E3</string>
 											<string>222BA21611C81765009CF8E3</string>
-											<string>22E3206311CA77B3008E8CBD</string>
 											<string>2299285511CFCEB10055BF95</string>
 											<string>2299285611CFCEB10055BF95</string>
-											<string>2299285711CFCEB10055BF95</string>
 											<string>2299285811CFCEB10055BF95</string>
-											<string>2299285911CFCEB10055BF95</string>
+											<string>22663BBD12D60AF7002E4167</string>
+											<string>22663BBE12D60AF7002E4167</string>
+											<string>22663BBF12D60AF7002E4167</string>
+											<string>22663BC012D60AF7002E4167</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -371,14 +372,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {1033, 730}}</string>
+								<string>{{0, 0}, {1033, 728}}</string>
 								<key>RubberWindowFrame</key>
 								<string>10 102 1241 868 0 0 1280 1002 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>730pt</string>
+							<string>728pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -391,14 +392,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 735}, {1033, 92}}</string>
+								<string>{{0, 733}, {1033, 94}}</string>
 								<key>RubberWindowFrame</key>
 								<string>10 102 1241 868 0 0 1280 1002 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>92pt</string>
+							<string>94pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -417,9 +418,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>22F948F811D1071600B08E7D</string>
+				<string>22663BBA12D60AD1002E4167</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>22F948F911D1071600B08E7D</string>
+				<string>22663BBB12D60AD1002E4167</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -558,7 +559,7 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>22322F6E1068349B00641384</string>
-		<string>/Users/sam/Documents/School/ENGCVS/EPANET/BASE/trunk/build/Xcode/epanet/epanet.xcodeproj</string>
+		<string>/Users/sam/Desktop/epanet/build/Xcode/epanet/epanet.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>10 102 1241 868 0 0 1280 1002 </string>
@@ -638,7 +639,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>22322F6E1068349B00641384</string>
-				<string>22F948FA11D1071600B08E7D</string>
+				<string>22663BBC12D60AD1002E4167</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>

build/Xcode/epanet/epanet.xcodeproj/sam.pbxuser

@@ -21,7 +21,7 @@
 				PBXFileTableDataSourceColumnWidthsKey = (
 					22,
 					300,
-					387,
+					682,
 				);
 				PBXFileTableDataSourceColumnsKey = (
 					PBXExecutablesDataSource_ActiveFlagID,
@@ -80,7 +80,7 @@
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
 				PBXFileTableDataSourceColumnWidthsKey = (
 					20,
-					736,
+					754,
 					60,
 					20,
 					48,
@@ -97,8 +97,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 298910365;
+			PBXPerProjectTemplateStateSaveDate = 316017359;
-			PBXWorkspaceStateSaveDate = 298910365;
+			PBXWorkspaceStateSaveDate = 316017359;
 		};
 		perUserProjectItems = {
 			2211345511C189B0006B6918 /* PBXTextBookmark */ = 2211345511C189B0006B6918 /* PBXTextBookmark */;
@@ -112,23 +112,23 @@
 			223C3E2711C42F5800F60805 /* PBXTextBookmark */ = 223C3E2711C42F5800F60805 /* PBXTextBookmark */;
 			223C3E2A11C42F5800F60805 /* PBXTextBookmark */ = 223C3E2A11C42F5800F60805 /* PBXTextBookmark */;
 			223C3E2E11C42F5800F60805 /* PBXTextBookmark */ = 223C3E2E11C42F5800F60805 /* PBXTextBookmark */;
+			22663BBD12D60AF7002E4167 /* PBXTextBookmark */ = 22663BBD12D60AF7002E4167 /* PBXTextBookmark */;
+			22663BBE12D60AF7002E4167 /* PBXTextBookmark */ = 22663BBE12D60AF7002E4167 /* PBXTextBookmark */;
+			22663BBF12D60AF7002E4167 /* PBXTextBookmark */ = 22663BBF12D60AF7002E4167 /* PBXTextBookmark */;
+			22663BC012D60AF7002E4167 /* PBXTextBookmark */ = 22663BC012D60AF7002E4167 /* PBXTextBookmark */;
+			22663BCE12D60F65002E4167 /* PBXTextBookmark */ = 22663BCE12D60F65002E4167 /* PBXTextBookmark */;
 			226EC74811C6739B004BCBE1 /* PBXTextBookmark */ = 226EC74811C6739B004BCBE1 /* PBXTextBookmark */;
 			226EC80A11C6E506004BCBE1 /* PBXTextBookmark */ = 226EC80A11C6E506004BCBE1 /* PBXTextBookmark */;
 			226EC80B11C6E506004BCBE1 /* PBXTextBookmark */ = 226EC80B11C6E506004BCBE1 /* PBXTextBookmark */;
 			226EC80C11C6E506004BCBE1 /* PBXTextBookmark */ = 226EC80C11C6E506004BCBE1 /* PBXTextBookmark */;
-			2270671A119B4A0C00BA4EF4 /* PBXTextBookmark */ = 2270671A119B4A0C00BA4EF4 /* PBXTextBookmark */;
 			2270671C119B4A0C00BA4EF4 /* PBXTextBookmark */ = 2270671C119B4A0C00BA4EF4 /* PBXTextBookmark */;
 			2288D7DF112E28D600D8B4B4 /* PBXTextBookmark */ = 2288D7DF112E28D600D8B4B4 /* PBXTextBookmark */;
 			2299285511CFCEB10055BF95 /* PBXTextBookmark */ = 2299285511CFCEB10055BF95 /* PBXTextBookmark */;
 			2299285611CFCEB10055BF95 /* PBXTextBookmark */ = 2299285611CFCEB10055BF95 /* PBXTextBookmark */;
-			2299285711CFCEB10055BF95 /* PBXTextBookmark */ = 2299285711CFCEB10055BF95 /* PBXTextBookmark */;
 			2299285811CFCEB10055BF95 /* PBXTextBookmark */ = 2299285811CFCEB10055BF95 /* PBXTextBookmark */;
-			2299285911CFCEB10055BF95 /* PBXTextBookmark */ = 2299285911CFCEB10055BF95 /* PBXTextBookmark */;
 			22B1773E1199DED400A8EEC2 /* PBXTextBookmark */ = 22B1773E1199DED400A8EEC2 /* PBXTextBookmark */;
 			22CA5CC610977F26002D87B6 /* PBXTextBookmark */ = 22CA5CC610977F26002D87B6 /* PBXTextBookmark */;
 			22D84C7E106845A4006D3DEE /* PBXTextBookmark */ = 22D84C7E106845A4006D3DEE /* PBXTextBookmark */;
-			22E3206311CA77B3008E8CBD /* PBXTextBookmark */ = 22E3206311CA77B3008E8CBD /* PBXTextBookmark */;
-			22F948F711D1071600B08E7D /* PBXTextBookmark */ = 22F948F711D1071600B08E7D /* PBXTextBookmark */;
 		};
 		sourceControlManager = 22322F61106833AB00641384 /* Source Control */;
 		userBuildSettings = {
@@ -276,9 +276,9 @@
 	};
 	22322F711068369500641384 /* epanet.c */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {972, 47730}}";
+			sepNavIntBoundsRect = "{{0, 0}, {972, 47670}}";
 			sepNavSelRange = "{15379, 7}";
-			sepNavVisRange = "{14683, 1414}";
+			sepNavVisRange = "{14683, 1412}";
 		};
 	};
 	22322F721068369500641384 /* funcs.h */ = {
@@ -290,9 +290,9 @@
 	};
 	22322F731068369500641384 /* hash.c */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1051, 1575}}";
+			sepNavIntBoundsRect = "{{0, 0}, {972, 1575}}";
-			sepNavSelRange = "{1537, 0}";
+			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{642, 897}";
+			sepNavVisRange = "{0, 1451}";
 		};
 	};
 	22322F741068369500641384 /* hash.h */ = {
@@ -417,9 +417,9 @@
 	};
 	22322FA9106836B000641384 /* epanet2.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {972, 3600}}";
+			sepNavIntBoundsRect = "{{0, 0}, {972, 3510}}";
 			sepNavSelRange = "{1888, 0}";
-			sepNavVisRange = "{215, 1260}";
+			sepNavVisRange = "{4726, 1746}";
 		};
 	};
 	22322FAD106836D900641384 /* malloc.h */ = {
@@ -469,6 +469,56 @@
 		vrLen = 1397;
 		vrLoc = 0;
 	};
+	22663BBD12D60AF7002E4167 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 22322F841068369500641384 /* vars.h */;
+		name = "vars.h: 179";
+		rLen = 0;
+		rLoc = 12342;
+		rType = 0;
+		vrLen = 2670;
+		vrLoc = 10638;
+	};
+	22663BBE12D60AF7002E4167 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 22322F711068369500641384 /* epanet.c */;
+		name = "epanet.c: 500";
+		rLen = 7;
+		rLoc = 15379;
+		rType = 0;
+		vrLen = 1412;
+		vrLoc = 14683;
+	};
+	22663BBF12D60AF7002E4167 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 22322F731068369500641384 /* hash.c */;
+		name = "hash.c: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1451;
+		vrLoc = 0;
+	};
+	22663BC012D60AF7002E4167 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 22322FA9106836B000641384 /* epanet2.h */;
+		name = "epanet2.h: 74";
+		rLen = 0;
+		rLoc = 1888;
+		rType = 0;
+		vrLen = 1260;
+		vrLoc = 215;
+	};
+	22663BCE12D60F65002E4167 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 22322FA9106836B000641384 /* epanet2.h */;
+		name = "epanet2.h: 74";
+		rLen = 0;
+		rLoc = 1888;
+		rType = 0;
+		vrLen = 1746;
+		vrLoc = 4726;
+	};
 	226EC74811C6739B004BCBE1 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 22322F721068369500641384 /* funcs.h */;
@@ -509,16 +559,6 @@
 		vrLen = 1198;
 		vrLoc = 22319;
 	};
-	2270671A119B4A0C00BA4EF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 22322F731068369500641384 /* hash.c */;
-		name = "hash.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1200;
-		vrLoc = 0;
-	};
 	2270671C119B4A0C00BA4EF4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 22322F7C1068369500641384 /* output.c */;
@@ -559,16 +599,6 @@
 		vrLen = 156;
 		vrLoc = 0;
 	};
-	2299285711CFCEB10055BF95 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 22322FA9106836B000641384 /* epanet2.h */;
-		name = "epanet2.h: 74";
-		rLen = 0;
-		rLoc = 1888;
-		rType = 0;
-		vrLen = 1260;
-		vrLoc = 215;
-	};
 	2299285811CFCEB10055BF95 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 22322F821068369500641384 /* toolkit.h */;
@@ -579,16 +609,6 @@
 		vrLen = 1781;
 		vrLoc = 5086;
 	};
-	2299285911CFCEB10055BF95 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 22322F841068369500641384 /* vars.h */;
-		name = "vars.h: 179";
-		rLen = 0;
-		rLoc = 12342;
-		rType = 0;
-		vrLen = 2595;
-		vrLoc = 10713;
-	};
 	22B1773E1199DED400A8EEC2 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 22B1773F1199DED400A8EEC2 /* example1.cpp */;
@@ -640,26 +660,6 @@
 		path = /Users/sam/Documents/School/ENGCVS/EPANET/BASE/trunk/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj;
 		sourceTree = "<absolute>";
 	};
-	22E3206311CA77B3008E8CBD /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 22322F711068369500641384 /* epanet.c */;
-		name = "epanet.c: 500";
-		rLen = 7;
-		rLoc = 15379;
-		rType = 0;
-		vrLen = 1414;
-		vrLoc = 14683;
-	};
-	22F948F711D1071600B08E7D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 22322F841068369500641384 /* vars.h */;
-		name = "vars.h: 179";
-		rLen = 0;
-		rLoc = 12342;
-		rType = 0;
-		vrLen = 2670;
-		vrLoc = 10638;
-	};
 	D2AAC0620554660B00DB518D /* epanet */ = {
 		activeExec = 0;
 	};