Update XDarwin project to Xcode 1.5 format and remove unused

    QUARTZ_SAFETY_DELAY code.

2 files changed, 392 insertions, 30 deletions

diff --git a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
index 109e313f3..90002db56 100644
--- a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
+++ b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
@@ -3,30 +3,38 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 38;
+	objectVersion = 39;
 	objects = {
 		01279092000747AA0A000002 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
 			path = XServer.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		0127909600074AF60A000002 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
 			path = XApplication.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		0127909800074B1A0A000002 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = XApplication.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		015698ED003DF345CE6F79C2 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.icns;
 			path = XDarwin.icns;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		0157A37D002CF6D7CE6F79C2 = {
 			children = (
@@ -44,18 +52,23 @@
 			name = Credits.rtf;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		0157A37E002CF6D7CE6F79C2 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			name = English;
 			path = English.lproj/Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		015EDCEA004203A8CE6F79C2 = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = IOKit.framework;
 			path = /System/Library/Frameworks/IOKit.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		018F40F2003E1902CE6F79C2 = {
 			children = (
@@ -70,48 +83,63 @@
 			name = "X Server";
 			path = ..;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		018F40F3003E1916CE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = darwin.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		018F40F6003E1974CE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = darwinKeyboard.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		018F40F8003E1979CE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = quartz.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		018F40FA003E197ECE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = quartz.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		018F40FC003E1983CE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = xfIOKit.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		018F40FE003E1988CE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = xfIOKit.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		018F4100003E19E4CE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = xfIOKitCursor.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //010
 //011
@@ -126,20 +154,26 @@
 		021D6BA9003E1BACCE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = darwin.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		02A1FEA6006D34BE416877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = xfIOKitStartup.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		02A1FEA8006D38F0416877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = quartzStartup.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		02E03CA000348209CE6F79C2 = {
 			children = (
@@ -157,13 +191,16 @@
 			name = XDarwinHelp.html;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		02E03CA100348209CE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.html;
 			name = English;
 			path = English.lproj/XDarwinHelp.html;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //020
 //021
@@ -178,8 +215,10 @@
 		0338412F0083BFE57F000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = quartzCursor.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //030
 //031
@@ -194,14 +233,18 @@
 		04329610000763920A000002 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
 			path = Preferences.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		04329611000763920A000002 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = Preferences.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //040
 //041
@@ -225,6 +268,7 @@
 			isa = PBXGroup;
 			name = Classes;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		089C165CFE840E0CC02AAC07 = {
 			children = (
@@ -241,13 +285,16 @@
 			isa = PBXVariantGroup;
 			name = InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		089C165DFE840E0CC02AAC07 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = English;
 			path = English.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //080
 //081
@@ -260,9 +307,11 @@
 //0A3
 //0A4
 		0A79E19E004499A1CE6F79C2 = {
-			isa = PBXApplicationReference;
+			explicitFileType = wrapper.application;
+			isa = PBXFileReference;
 			path = XDarwin.app;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		0A79E19F004499A1CE6F79C2 = {
 			buildPhases = (
@@ -454,12 +503,15 @@
 			isa = PBXGroup;
 			name = "Linked Frameworks";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1058C7A1FEA54F0111CA2CBB = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = Cocoa.framework;
 			path = /System/Library/Frameworks/Cocoa.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		1058C7A2FEA54F0111CA2CBB = {
 			children = (
@@ -469,6 +521,7 @@
 			isa = PBXGroup;
 			name = "Other Frameworks";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //100
 //101
@@ -496,13 +549,16 @@
 			name = Localizable.strings;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1220774400712D2D416877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = English;
 			path = English.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1220774500712D2D416877C2 = {
 			fileRef = 1220774300712D2D416877C2;
@@ -513,9 +569,11 @@
 		1220774600712D75416877C2 = {
 			fileEncoding = 10;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Japanese;
 			path = Japanese.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //120
 //121
@@ -530,8 +588,10 @@
 		170DFAFF00729A35416877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = XDarwinStartup.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		170DFB0000729C86416877C2 = {
 			children = (
@@ -544,6 +604,7 @@
 			name = IOKit;
 			path = ../iokit;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //170
 //171
@@ -566,6 +627,7 @@
 			isa = PBXGroup;
 			name = Products;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //190
 //191
@@ -593,13 +655,16 @@
 			name = InfoPlist.strings.cpp;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1BD8DE4300B8A3567F000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = English;
 			path = English.lproj/InfoPlist.strings.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1BD8DE4400B8A38E7F000001 = {
 			children = (
@@ -617,33 +682,42 @@
 			name = XDarwinHelp.html.cpp;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1BD8DE4500B8A38E7F000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = English;
 			path = English.lproj/XDarwinHelp.html.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1BD8DE4700B8A3C77F000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Japanese;
 			path = Japanese.lproj/InfoPlist.strings.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1BD8DE4800B8A4167F000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Japanese;
 			path = Japanese.lproj/XDarwinHelp.html.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1BE4F84D0006C9890A000002 = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = Carbon.framework;
 			path = /System/Library/Frameworks/Carbon.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 //1B0
 //1B1
@@ -658,8 +732,10 @@
 		1C4A3109004D8F24CE6F79C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = XServer.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //1C0
 //1C1
@@ -674,24 +750,29 @@
 		237A34C10076E37E7F000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = quartzAudio.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		237A34C20076E37E7F000001 = {
-			buildRules = (
-			);
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				OPTIMIZATION_CFLAGS = "-O0";
+				ZERO_LINK = YES;
 			};
 			isa = PBXBuildStyle;
 			name = Development;
 		};
 		237A34C30076E37E7F000001 = {
-			buildRules = (
-			);
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				ZERO_LINK = NO;
 			};
 			isa = PBXBuildStyle;
 			name = Deployment;
@@ -699,8 +780,10 @@
 		237A34C40076F4F07F000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = quartzAudio.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //230
 //231
@@ -713,6 +796,8 @@
 //293
 //294
 		29B97313FDCFA39411CA2CEA = {
+			buildSettings = {
+			};
 			buildStyles = (
 				237A34C20076E37E7F000001,
 				237A34C30076E37E7F000001,
@@ -760,6 +845,7 @@
 			name = "Xmaster-Cocoa";
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97315FDCFA39411CA2CEA = {
 			children = (
@@ -769,6 +855,7 @@
 			name = "Other Sources";
 			path = "";
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		29B97317FDCFA39411CA2CEA = {
 			children = (
@@ -787,6 +874,7 @@
 			name = Resources;
 			path = ../bundle;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97318FDCFA39411CA2CEA = {
 			children = (
@@ -804,12 +892,15 @@
 			name = MainMenu.nib;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97319FDCFA39411CA2CEA = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = English;
 			path = English.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97323FDCFA39411CA2CEA = {
 			children = (
@@ -820,18 +911,23 @@
 			name = Frameworks;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97324FDCFA39411CA2CEA = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = AppKit.framework;
 			path = /System/Library/Frameworks/AppKit.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		29B97325FDCFA39411CA2CEA = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = Foundation.framework;
 			path = /System/Library/Frameworks/Foundation.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 //290
 //291
@@ -852,6 +948,7 @@
 			name = "Old Cocoa Imp";
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //320
 //321
@@ -866,8 +963,10 @@
 		3576829A0077B8F17F000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = quartzCursor.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //350
 //351
@@ -882,8 +981,10 @@
 		3E74E03600863F047F000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = darwinClut8.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //3E0
 //3E1
@@ -916,50 +1017,65 @@
 			name = Quartz;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		43B962CF00617089416877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
 			path = quartzCocoa.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		43B962D000617089416877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = quartzPasteboard.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		43B962D100617089416877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = quartzPasteboard.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		43B962E000617B49416877C2 = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = Japanese;
 			path = Japanese.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		43B962E100617B49416877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Japanese;
 			path = Japanese.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		43B962E200617B93416877C2 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			name = Japanese;
 			path = Japanese.lproj/Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		43B962E300617B93416877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.html;
 			name = Japanese;
 			path = Japanese.lproj/XDarwinHelp.html;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //430
 //431
@@ -1061,73 +1177,124 @@
 ";
 		};
 		6E11A985048BDFEE006877C2 = {
-			isa = PBXBundleReference;
+			explicitFileType = wrapper.cfbundle;
+			isa = PBXFileReference;
 			path = glxCGL.bundle;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		6E11A986048BDFFB006877C2 = {
 			isa = PBXTargetDependency;
 			target = 6E11A984048BDFEE006877C2;
+			targetProxy = 6E4CAF650702464F001A7398;
+		};
+		6E4CAF630702464F001A7398 = {
+			containerPortal = 29B97313FDCFA39411CA2CEA;
+			isa = PBXContainerItemProxy;
+			proxyType = 1;
+			remoteGlobalIDString = 6EF7C58603D3BC6D00000104;
+			remoteInfo = glxAGL;
+		};
+		6E4CAF640702464F001A7398 = {
+			containerPortal = 29B97313FDCFA39411CA2CEA;
+			isa = PBXContainerItemProxy;
+			proxyType = 1;
+			remoteGlobalIDString = 6E79040F0500F05600EEC080;
+			remoteInfo = xpr;
+		};
+		6E4CAF650702464F001A7398 = {
+			containerPortal = 29B97313FDCFA39411CA2CEA;
+			isa = PBXContainerItemProxy;
+			proxyType = 1;
+			remoteGlobalIDString = 6E11A984048BDFEE006877C2;
+			remoteInfo = glxCGL;
+		};
+		6E4CAF660702464F001A7398 = {
+			containerPortal = 29B97313FDCFA39411CA2CEA;
+			isa = PBXContainerItemProxy;
+			proxyType = 1;
+			remoteGlobalIDString = 6EF065C503D4EE19006877C2;
+			remoteInfo = glxMesa;
 		};
 		6E5F5F0005537A1A008FEAD7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = darwinKeyboard.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E5F5F0105537A5F008FEAD7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = quartzKeyboard.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E5F5F030553815A008FEAD7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = keysym2ucs.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E5F5F040553815A008FEAD7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = keysym2ucs.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E6656EC048832CF006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = "x-hook.c";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E6656ED048832CF006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = "x-hook.h";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E6656F0048832EC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = dri.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E6656F1048832EC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = dri.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E6656F2048832EC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = dristruct.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E6656F3048832F9006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = appledri.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E79040104FD5ED900EEC080 = {
 			children = (
@@ -1139,24 +1306,31 @@
 			name = "Safe Alpha";
 			path = safeAlpha;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E79040204FD5EDA00EEC080 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = safeAlpha.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E79040304FD5EDA00EEC080 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = safeAlphaPicture.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E79040404FD5EDA00EEC080 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = safeAlphaWindow.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E79040A0500F05600EEC080 = {
 			buildActionMask = 2147483647;
@@ -1248,31 +1422,40 @@
 ";
 		};
 		6E7904100500F05600EEC080 = {
-			isa = PBXBundleReference;
+			explicitFileType = wrapper.cfbundle;
+			isa = PBXFileReference;
 			path = xpr.bundle;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		6E7904110500F33B00EEC080 = {
 			isa = PBXTargetDependency;
 			target = 6E79040F0500F05600EEC080;
+			targetProxy = 6E4CAF640702464F001A7398;
 		};
 		6E97A0F2050798B100B8294C = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = xprAppleWM.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E97A0F305079B6500B8294C = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
 			path = crAppleWM.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6E97A0F505079F9100B8294C = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = applewmExt.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA0B3AF0544A9CC006877C2 = {
 			children = (
@@ -1289,60 +1472,79 @@
 			name = Acceleration;
 			path = accel;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA0B3B00544A9CC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = rlAccel.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA0B3B10544A9CC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rlBlt.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA0B3B20544A9CC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rlCopy.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA0B3B30544A9CC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rlFill.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA0B3B40544A9CC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rlFillRect.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA0B3B50544A9CC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rlFillSpans.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA0B3B60544A9CC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rlGlyph.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA0B3B70544A9CC006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rlSolid.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EA8EEC80445E25C006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = rootlessConfig.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EC4A64C042A9597006877C2 = {
 			children = (
@@ -1362,54 +1564,71 @@
 			name = Rootless;
 			path = ../../../miext/rootless;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		6EC4A65D042A9654006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = rootless.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EC4A65E042A9654006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rootlessCommon.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EC4A65F042A9654006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = rootlessCommon.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EC4A660042A9654006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = rootlessWindow.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EC4A661042A9654006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rootlessScreen.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EC4A662042A9654006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rootlessWindow.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EC4A663042A9654006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rootlessGC.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EC4A664042A9654006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = rootlessValTree.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EC4A66D042A97FC006877C2 = {
 			children = (
@@ -1433,24 +1652,31 @@
 			isa = PBXGroup;
 			path = xpr;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6ECF218404589E4D006877C2 = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = xpr.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6ECF218604589F40006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = xprCursor.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EDDB2DF04508B2C006877C2 = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = xprScreen.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EE1214104968658006877C2 = {
 			children = (
@@ -1464,42 +1690,55 @@
 			isa = PBXGroup;
 			path = cr;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EE1214204968692006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = cr.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EE1214304968692006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
 			path = XView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EE1214404968692006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = XView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EE1214504968692006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
 			path = crFrame.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EE1214604968692006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
 			path = crScreen.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EE9B21604E859C200CA7FEA = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = applewm.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EF065C003D4EE19006877C2 = {
 			buildActionMask = 2147483647;
@@ -1591,53 +1830,69 @@
 ";
 		};
 		6EF065C603D4EE19006877C2 = {
-			isa = PBXBundleReference;
+			explicitFileType = wrapper.cfbundle;
+			isa = PBXFileReference;
 			path = glxMesa.bundle;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		6EF065C703D4EE19006877C2 = {
 			isa = PBXTargetDependency;
 			target = 6EF065C503D4EE19006877C2;
+			targetProxy = 6E4CAF660702464F001A7398;
 		};
 		6EF065C903D4F0CA006877C2 = {
 			isa = PBXTargetDependency;
 			target = 6EF7C58603D3BC6D00000104;
+			targetProxy = 6E4CAF630702464F001A7398;
 		};
 		6EF4719E04478B08006877C2 = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = xprFrame.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EF471A004478DE0006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = Xplugin.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EF471A204479263006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = "x-hash.c";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EF471A304479263006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = "x-list.h";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EF471A404479263006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = "x-hash.h";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EF471A504479263006877C2 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = "x-list.c";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6EF7C58103D3BC6D00000104 = {
 			buildActionMask = 2147483647;
@@ -1728,9 +1983,11 @@
 ";
 		};
 		6EF7C58703D3BC6D00000104 = {
-			isa = PBXBundleReference;
+			explicitFileType = wrapper.cfbundle;
+			isa = PBXFileReference;
 			path = glxAGL.bundle;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 //6E0
 //6E1
@@ -1744,179 +2001,233 @@
 //F54
 		F51BF62A02026DAF01000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = Portuguese;
 			path = Portuguese.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F51BF62B02026DDA01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Portuguese;
 			path = Portuguese.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F51BF62C02026E0601000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Portuguese;
 			path = Portuguese.lproj/InfoPlist.strings.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F51BF62D02026E1C01000001 = {
 			fileEncoding = 10;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Portuguese;
 			path = Portuguese.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F51BF62E02026E3501000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			name = Portuguese;
 			path = Portuguese.lproj/Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F51BF62F02026E5C01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.html;
 			name = Portuguese;
 			path = Portuguese.lproj/XDarwinHelp.html;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F51BF63002026E8D01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Portuguese;
 			path = Portuguese.lproj/XDarwinHelp.html.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5269C2D01D5BC3501000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = pseudoramiX.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5269C2E01D5BC3501000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = pseudoramiX.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53321390193CB6A01000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = German;
 			path = German.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533213A0193CBA201000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = German;
 			path = German.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533213B0193CBB401000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = German;
 			path = German.lproj/InfoPlist.strings.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533213C0193CBC901000001 = {
 			fileEncoding = 10;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = German;
 			path = German.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533213D0193CBE001000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			name = German;
 			path = German.lproj/Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533213E0193CBF401000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.html;
 			name = German;
 			path = German.lproj/XDarwinHelp.html;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533213F0193CC2501000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = German;
 			path = German.lproj/XDarwinHelp.html.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53321400193CCF001000001 = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = ApplicationServices.framework;
 			path = /System/Library/Frameworks/ApplicationServices.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		F53321410193CCF001000001 = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = CoreAudio.framework;
 			path = /System/Library/Frameworks/CoreAudio.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		F533214201A4B3CE01000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = Dutch;
 			path = Dutch.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533214301A4B3F001000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Dutch;
 			path = Dutch.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533214401A4B40F01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Dutch;
 			path = Dutch.lproj/InfoPlist.strings.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533214501A4B42501000001 = {
 			fileEncoding = 10;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Dutch;
 			path = Dutch.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533214601A4B45401000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			name = Dutch;
 			path = Dutch.lproj/Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533214701A4B48301000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.html;
 			name = Dutch;
 			path = Dutch.lproj/XDarwinHelp.html;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F533214801A4B4D701000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Dutch;
 			path = Dutch.lproj/XDarwinHelp.html.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F54BF6EA017D500901000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			path = startXClients.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F54BF6EC017D506E01000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.script.sh;
 			path = startXClients;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F54BF6ED017D506E01000001 = {
 			fileRef = F54BF6EC017D506E01000001;
@@ -1927,14 +2238,18 @@
 		F5582948015DAD3B01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = quartzCommon.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5614B3B0251124C01000114 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = fullscreen.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5614B3D025112D901000114 = {
 			children = (
@@ -1945,200 +2260,259 @@
 			isa = PBXGroup;
 			path = fullscreen;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F587E16001924C1D01000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = Swedish;
 			path = Swedish.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F587E16101924C2F01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Swedish;
 			path = Swedish.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F587E16201924C5301000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Swedish;
 			path = Swedish.lproj/InfoPlist.strings.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F587E16301924C5E01000001 = {
 			fileEncoding = 10;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Swedish;
 			path = Swedish.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F587E16401924C6901000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			name = Swedish;
 			path = Swedish.lproj/Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F587E16501924C7401000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.html;
 			name = Swedish;
 			path = Swedish.lproj/XDarwinHelp.html;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F587E16601924C9D01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Swedish;
 			path = Swedish.lproj/XDarwinHelp.html.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F58D65DB018F793801000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = French;
 			path = French.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F58D65DC018F794D01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = French;
 			path = French.lproj/InfoPlist.strings.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F58D65DD018F798F01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = French;
 			path = French.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F58D65DE018F79A001000001 = {
 			fileEncoding = 10;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = French;
 			path = French.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F58D65DF018F79B101000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			name = French;
 			path = French.lproj/Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F58D65E0018F79C001000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.html;
 			name = French;
 			path = French.lproj/XDarwinHelp.html;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F58D65E1018F79E001000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = French;
 			path = French.lproj/XDarwinHelp.html.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5A94EF10314BAC70100011B = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = darwinEvents.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD25CC5B5E96601000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			name = Spanish;
 			path = Spanish.lproj/Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD25DC5B5E97701000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Spanish;
 			path = Spanish.lproj/InfoPlist.strings.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD25EC5B5E98D01000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = Spanish;
 			path = Spanish.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD25FC5B5E9AA01000001 = {
 			fileEncoding = 10;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Spanish;
 			path = Spanish.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD260C5B5E9DF01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Spanish;
 			path = Spanish.lproj/XDarwinHelp.html.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD261C5B5EA2001000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.html;
 			name = Spanish;
 			path = Spanish.lproj/XDarwinHelp.html;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD262C5B5EA4D01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = Spanish;
 			path = Spanish.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD263C5BE031F01000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			name = ko;
 			path = ko.lproj/Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD264C5BE035B01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ko;
 			path = ko.lproj/InfoPlist.strings.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD265C5BE038601000001 = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = ko;
 			path = ko.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD266C5BE03C501000001 = {
 			fileEncoding = 10;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = ko;
 			path = ko.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD267C5BE03FC01000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ko;
 			path = ko.lproj/XDarwinHelp.html.cpp;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD268C5BE046401000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.html;
 			name = ko;
 			path = ko.lproj/XDarwinHelp.html;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5ACD269C5BE049301000001 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = ko;
 			path = ko.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 	};
 	rootObject = 29B97313FDCFA39411CA2CEA;
diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c
index 5a11d5321..cd58701b1 100644
--- a/hw/darwin/quartz/quartzStartup.c
+++ b/hw/darwin/quartz/quartzStartup.c
@@ -4,7 +4,7 @@
  *
  **************************************************************/
 /*
- * Copyright (c) 2001-2003 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -264,28 +264,16 @@ int DarwinModeProcessArgument( int argc, char *argv[], int i )
 
     if ( !strcmp( argv[i], "-fullscreen" ) ) {
         ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
-#ifdef QUARTZ_SAFETY_DELAY
-        ErrorF( "Quitting in %d seconds if no controller is found.\n",
-                QUARTZ_SAFETY_DELAY );
-#endif
         return 1;
     }
 
     if ( !strcmp( argv[i], "-rootless" ) ) {
         ErrorF( "Running rootless inside Mac OS X window server.\n" );
-#ifdef QUARTZ_SAFETY_DELAY
-        ErrorF( "Quitting in %d seconds if no controller is found.\n",
-                QUARTZ_SAFETY_DELAY );
-#endif
         return 1;
     }
 
     if ( !strcmp( argv[i], "-quartz" ) ) {
         ErrorF( "Running in parallel with Mac OS X Quartz window server.\n" );
-#ifdef QUARTZ_SAFETY_DELAY
-        ErrorF( "Quitting in %d seconds if no controller is found.\n",
-                QUARTZ_SAFETY_DELAY );
-#endif
         return 1;
     }