[frontierkernel-commits] Frontier/build_XCode/Frontier.xcode project.pbxproj,1.13.2.3,1.13.2.4

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9186/build_XCode/Frontier.xcode

Modified Files:
      Tag: New_Tables_Experiment-branch
	project.pbxproj 
Log Message:
merged trunk, from merged-Root-of-New_Tables_Experiment to HEAD (conflicts resovled)

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode/project.pbxproj,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C2 -d -r1.13.2.3 -r1.13.2.4
*** project.pbxproj	14 Nov 2004 18:02:21 -0000	1.13.2.3
--- project.pbxproj	1 Dec 2004 19:44:46 -0000	1.13.2.4
***************
*** 297,301 ****
  				65D516AB072CED430097D18E,
  				65BBB664072E5643008E2F34,
! 				654C0C700747D3DE002FA7FA,
  			);
  			isa = PBXHeadersBuildPhase;
--- 297,301 ----
  				65D516AB072CED430097D18E,
  				65BBB664072E5643008E2F34,
! 				65487ED8075E522900E88CC7,
  			);
  			isa = PBXHeadersBuildPhase;
***************
*** 551,555 ****
  				651527A0072BFC6900411831,
  				651527AC072BFC6900411831,
! 				654C0C720747D415002FA7FA,
  			);
  			isa = PBXSourcesBuildPhase;
--- 551,555 ----
  				651527A0072BFC6900411831,
  				651527AC072BFC6900411831,
! 				65487ED6075E520400E88CC7,
  			);
  			isa = PBXSourcesBuildPhase;
***************
*** 1812,1816 ****
  				651525E2072BFC6700411831,
  				651525EB072BFC6700411831,
! 				654C0C710747D415002FA7FA,
  				651525EC072BFC6700411831,
  				651525ED072BFC6700411831,
--- 1812,1816 ----
  				651525E2072BFC6700411831,
  				651525EB072BFC6700411831,
! 				65487ED5075E520400E88CC7,
  				651525EC072BFC6700411831,
  				651525ED072BFC6700411831,
***************
*** 8345,8374 ****
  			};
  		};
! 		654C0C6F0747D3DE002FA7FA = {
  			fileEncoding = 30;
  			isa = PBXFileReference;
! 			lastKnownFileType = sourcecode.c.h;
! 			name = arraylist.h;
! 			path = ../Common/headers/arraylist.h;
  			refType = 2;
  			sourceTree = SOURCE_ROOT;
  		};
! 		654C0C700747D3DE002FA7FA = {
! 			fileRef = 654C0C6F0747D3DE002FA7FA;
  			isa = PBXBuildFile;
  			settings = {
  			};
  		};
! 		654C0C710747D415002FA7FA = {
  			fileEncoding = 30;
  			isa = PBXFileReference;
! 			lastKnownFileType = sourcecode.c.c;
! 			name = arraylist.c;
! 			path = ../Common/source/arraylist.c;
  			refType = 2;
  			sourceTree = SOURCE_ROOT;
  		};
! 		654C0C720747D415002FA7FA = {
! 			fileRef = 654C0C710747D415002FA7FA;
  			isa = PBXBuildFile;
  			settings = {
--- 8345,8374 ----
  			};
  		};
! 		65487ED5075E520400E88CC7 = {
  			fileEncoding = 30;
  			isa = PBXFileReference;
! 			lastKnownFileType = sourcecode.c.c;
! 			name = arraylist.c;
! 			path = ../Common/source/arraylist.c;
  			refType = 2;
  			sourceTree = SOURCE_ROOT;
  		};
! 		65487ED6075E520400E88CC7 = {
! 			fileRef = 65487ED5075E520400E88CC7;
  			isa = PBXBuildFile;
  			settings = {
  			};
  		};
! 		65487ED7075E522900E88CC7 = {
  			fileEncoding = 30;
  			isa = PBXFileReference;
! 			lastKnownFileType = sourcecode.c.h;
! 			name = arraylist.h;
! 			path = ../Common/headers/arraylist.h;
  			refType = 2;
  			sourceTree = SOURCE_ROOT;
  		};
! 		65487ED8075E522900E88CC7 = {
! 			fileRef = 65487ED7075E522900E88CC7;
  			isa = PBXBuildFile;
  			settings = {
***************
*** 8428,8432 ****
  				6515292E072BFFE100411831,
  				6515283C072BFE8A00411831,
! 				654C0C6F0747D3DE002FA7FA,
  				6515284E072BFE9C00411831,
  				651528D2072BFF2200411831,
--- 8428,8432 ----
  				6515292E072BFFE100411831,
  				6515283C072BFE8A00411831,
! 				65487ED7075E522900E88CC7,
  				6515284E072BFE9C00411831,
  				651528D2072BFF2200411831,