Vm-dev August 2010

vm-dev@lists.squeakfoundation.org

26 participants
51 discussions

ffi-test-main.c fails on FreeBSD
by Gary Dunn 12 Aug '16

12 Aug '16

In conjunction with getting Open Cobalt running on FreeBSD I have been looking into the problems with SqueakFFIPrims on FreeBSD and have reached a point that is beyond my understanding. I am not sure if the fix should come from the VM side or the FreeBSD port maintainer. I needed to get source code back into the ports tree so I did a make in /usr/ports/lang/squeak. I already had the 3.9 tarball, so that just repopulated the source and did the initial build. In the "files" folder I found patch files typical for a FreeBSD port. These patch source files from a generic tarball to work with FreeBSD. The one of interest was patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config which contains ----x-----x----- --- platforms/unix/plugins/SqueakFFIPrims/ffi-config.org Wed Apr 26 20:27:53 2006 +++ platforms/unix/plugins/SqueakFFIPrims/ffi-config Wed Apr 26 20:29:00 2006 @@ -39,6 +39,7 @@ case ${abi} in linux) abi=sysv;; + freebsd*) abi=sysv;; darwin*) abi=darwin;; *) abi=libffi; lib="-lffi";; esac -----x-----x----- I then had the folder work/Squeak-3.9-7/platforms/unix/plugins/SqueakFFIPrims In it is a file 00README which explains how to test FFI. It says to run ffi-test-config but I have no such file. It says to type "make" to build a test suite but the build failed. It says to try with make CPU=any ABI=libffi LIB=-lffi which also failed. I traced the problem to the gcc search paths for includes and libraries -- turns out FreeBSD only searches /usr/include and /usr/lib when the required files are in /usr/local/include and /usr/local/lib. After some fiddling I finally had a "main" to test. It failed: ffi-test-main.c failed at line 361. Here is a bit from that file, ending with line 361: ffiInitialize(); for (ul= 0; ul < 15; ++ul) ffiPushSingleFloat(fa[ul]); GO(FFITypeSingleFloat, many); f= ffiReturnFloatValue(); ffiCleanup(); CHECK(f - ff < FLT_EPSILON); I worked out the CHECK macro but could not find what FLT_EPSILON is. At that point I decided to stop and come to you for help. Where do I go from here? -- Gary Dunn, Honolulu osp(a)aloha.com http://openslate.net/ http://e9erust.blogspot.com/ Sent from Slate001

5 8

Profiling and delay accuracy
by Andreas Raab 06 Aug '11

06 Aug '11

Hi Folks - For a long time now I had this feeling that MessageTally reports pretty bogus results in many situations without being able to precisely track down why this would be the case. Today I was looking at primitiveResponse() and, much to my surprise, noticed that the checkForInterrupts() that used to be there for years is gone (see Squeak3.6 for example which still has it). The sole reason for this check was to get both high delay accuracy and good profiling behavior. Consider this example: fc := FormCanvas on: Display. MessageTally spyOn:[ 1 to: 100 do:[:i| fc fillColor: Color white. fc printString. ]. ]. Using 3.6 this will be measured correctly as: **Tree** 87.5% {243ms} FormCanvas>>fillColor: |87.5% {243ms} GrafPort>>fillRect:offset: | 87.5% {243ms} GrafPort>>copyBits 12.5% {35ms} FormCanvas(Object)>>printString 12.5% {35ms} FormCanvas(Object)>>printStringLimitedTo: whereas the 3.10 reports it as **Tree** 99.6% {670ms} FormCanvas(Object)>>printString 94.9% {639ms} primitives 4.6% {31ms} FormCanvas(Object)>>printStringLimitedTo: I think you can see the problem and just imagine what this does to any cumulative results. I also wonder what that change does to platforms that don't have high-resolution asynchronous timers. This used to be the one place where we would catch timer changes at high resolution and unless the platform forces high resolution timer interrupts asynchronously (by resetting the interrupt counter) we must be loosing a lot in terms of delay accuracy. (it just so happens that the Windows VM *does* do asynchronous timer interrupts so I never noticed this but I'm very curious about the difference on Linux which typically still has pretty bad timer granularity). Any opinions? My feeling is that the timer check should go back in for all of the above reasons. At the very least a quickCheckForInterrupt() is required but I actually think putting the full check back in is worth it. Cheers, - Andreas

3 3

4.0.3.2196 for Unix
by Ian Piumarta 08 May '11

08 May '11

Folks, Source and binaries for Linux/i386, Darwin/i386 & Darwin/PPC now available. (Solaris, NetBSD and FreeBSD still at 3.11.3 until I get my kvm working again.) http://squeakvm.org/unix Enjoy! Ian Major changes since 3.11.3.2135: Generated sources rebuilt from VMMaker-dtl.169. Re-enabled MIDI support via ALSA on Linux. Broken locales should no longer cause line ends to go missing during copy and paste. Add support for "platform source version" primitive. Remove debugging beep on first clipboard copy under X11. Allow fully-qualified pathnames when loading modules. Bundle FreetypePlugin with source and binary releases. Various fixes for 64-bit cleanliness (many thanks to Dave Lewis). Add microsecond clock support. Fix launching from a menu under KDE. Fix --CFLAGS option in configure script. Serial plugin invalidates cached port names on close. Better handling of symlinks when looking for absolute path to VM binary.

5 12

Joys of Squeak-dev image, VM Compiling on MacIntel and Spoon remote OtherBrowsing
by Ken G. Brown 16 Nov '10

16 Nov '10

MacPro OS X 10.4.9 Xcode 2.4.1 Squeak-dev-114-2, VMMaker 2.8b6.1, Squeak 3.8.15beta6U.app, and version 1657 of svn MacOS VM sources, and Spoon v2a12. Downloaded http://www.squeakvm.org/cgi-bin/viewcvs.cgi/ trunk version 1657 for MacOS Ran squeak-dev-beta-114-2.image on Squeak 3.8.15beta6U.app Loaded VMMaker 3.8b6.1 from dev image Universes. Generated vm sources by following instructions in <http://www.squeakvm.org/cgi-bin/viewcvs.cgi/trunk/platforms/Mac%20OS/vm/Doc…> Fought with Xcode wanting to use MacOSX10.3.9.sdk for ppc which was giving an error which was known and documented in the Readme. Finally figured out what Xcode wanted so built universal app just using 10.4.9 sdk. Couple issues: Exupery references remain in sqnamedPrims.h and sqPlatformSpecific.h from svn version 1657, I just commented them out. Notes said: Info-NPSqueak__Upgraded_.plist was to be found in the Developer directory. I could not find it so scammed a info.plist out of John's Squeak 3.8.15beta6U.app vm. Not sure what impact this has. And much, much diddling about figuring out various things... Finally got a build. It's a lot smaller (3.9MB) than John McIntosh's Squeak 3.8.15beta6U.app (8.1MB), and it looks like it is a PowerPC one but at least it runs. I'll look into the Xcode build process some more. Then: Replaced interp.c with Craig's interp.c for Spoon, rebuilt and got a VM with Spoon client stuff. Downloaded Spoon release 2a12. Moved a copy of Flow plugin from within Craig's naiad.app package into a plugins subdirectory where the new spoon client compatible MacIntel universal VM was run from. Followed Craig's Spoon instructions for loading niaid.st and niaid.pr into the 3.10 image (Squeak-dev-114-2) running on the new VM. Did the run spoon.app thing from Spoon.dmg (version 2a12), needs to be done twice if Safari is not running. Got Spoon processor running. Followed instructions again in the Spoon client and lo! Got OtherBrowser browsing the Spoon memory running on processor. Yay Craig! Who do i get to sign my certificate? :) Ken

4 7

normalSend, specialObjectsArray and VM
by Mariano Martinez Peck 03 Oct '10

03 Oct '10

Hi folks. I need to intercept ALL message sends. For the moment, I intercepted in Interpreter >> normalSend But now, I have a question: I know there is that specialObjectArray that contain objects that may be accessed by the VM. So, the first question is, they are only ACCESSED and to things with pointers or they also send messages to those objects from the VM? If the VM really send messages to those object, how that is done ? The code goes also by normalSend ? Or they go from somewhere else that I am not intercepting. Thank you very much. Mariano

7 17

Simulate "3+4" with InterpreterSimulator
by Ang BeePeng 08 Sep '10

08 Sep '10

Hi, I have a InterpreterSimulator start up, in a workspace I type "3+4". From here, I want to step through bytecode per bytecode, when I hit "print". What should I do to achieve this? Can I debug on the interpreter in the middle of the simulation? Or perhaps I need to put a "self halt" somewhere in the VM source? Thanks. Ang Beepeng -- View this message in context: http://n4.nabble.com/Simulate-3-4-with-InterpreterSimulator-tp1678060p16780… Sent from the Squeak - VM mailing list archive at Nabble.com.

5 20

[commit] r2268 - iOS open/GL work, use double buffering, change flush rules. Improves dragon drawing by 3x, but still slow
by commits＠squeakvm.org 31 Aug '10

31 Aug '10

Author: johnmci Date: 2010-08-30 21:00:50 -0700 (Mon, 30 Aug 2010) New Revision: 2268 Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m trunk/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist Log: iOS open/GL work, use double buffering, change flush rules. Improves dragon drawing by 3x, but still slow Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m 2010-08-29 05:20:46 UTC (rev 2267) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m 2010-08-31 04:00:50 UTC (rev 2268) @@ -41,11 +41,18 @@ @implementation sqSqueakMainApplication (events) - (void) pumpRunLoop { + static NSTimeInterval old = 0.0; + NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate]; + if ((now - old) < 1.0/30.0) + return; + + old = now; + /* This the carbon logic model described by http://developer.apple.com/qa/qa2001/qa1061.html but fails on device, bug tracking number 5971848 */ - + NSRunLoop *theRL = [NSRunLoop mainRunLoop]; BOOL result = [theRL runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]]; Modified: trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m =================================================================== --- trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2010-08-29 05:20:46 UTC (rev 2267) +++ trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2010-08-31 04:00:50 UTC (rev 2268) @@ -115,11 +115,12 @@ resetFrame.size.width = width; resetFrame.size.height = height; [gDelegateApp.window setAcceptsMouseMovedEvents: YES]; - [gDelegateApp.window useOptimizedDrawing: NO]; + [gDelegateApp.window useOptimizedDrawing: YES]; [gDelegateApp.window setTitle: [[self.squeakApplication.imageNameURL path] lastPathComponent]]; [gDelegateApp.window setRepresentedURL: self.squeakApplication.imageNameURL]; [gDelegateApp.window setInitialFirstResponder: gDelegateApp.mainView]; [gDelegateApp.window setShowsResizeIndicator: NO]; + extern sqInt getFullScreenFlag(void); #if (SQ_VI_BYTES_PER_WORD == 4) NSPanel *panel; Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m 2010-08-29 05:20:46 UTC (rev 2267) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m 2010-08-31 04:00:50 UTC (rev 2268) @@ -82,7 +82,8 @@ #if (SQ_VI_BYTES_PER_WORD == 4) #if STACKVM - return "Mac Cocoa Cog 5.8b4 27-Aug-10 >5954D562-FB39-4195-9D19-EBB49FAECCF7<"; + return "Mac Cocoa Cog 5.8b5 30-Aug-10 >0A92B82A-9AC1-4B0E-9DEE-440C3FFAE568<"; +// return "Mac Cocoa Cog 5.8b4 27-Aug-10 >5954D562-FB39-4195-9D19-EBB49FAECCF7<"; // return "Mac Cocoa Cog 5.8b3 21-Aug-10 >5954D562-FB39-4195-9D19-EBB49FAECCF7<"; // return "Mac Cocoa Cog 5.8b2 08-Jul-10 >7BCAB029-A835-4D12-946D-4AB7083D2955<"; // return "Mac Cocoa Cog 5.8b1 07-Jul-10 >529F6B5A-DC81-4C1F-81B6-3D99741B954A<"; Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m 2010-08-29 05:20:46 UTC (rev 2267) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m 2010-08-31 04:00:50 UTC (rev 2268) @@ -62,6 +62,7 @@ { NSOpenGLPFAAccelerated, NSOpenGLPFANoRecovery, + NSOpenGLPFABackingStore, 0 }; return[[NSOpenGLPixelFormat alloc] initWithAttributes:attrs]; @@ -129,11 +130,11 @@ [self setNeedsDisplayInRect: what]; } -- (void) drawThelayers { - if([[self window] viewsNeedDisplay]) { - [self displayIfNeeded]; -// NSLog(@"drawTheLayers flushHappened"); +- (void) drawThelayers { + if (syncNeeded) { + [[self openGLContext] makeCurrentContext]; glFlush(); + [[NSOpenGLContext currentContext] flushBuffer]; syncNeeded = NO; } if (!firstDrawCompleted) { @@ -144,11 +145,12 @@ } -(void)setupOpenGL { - CGLContextObj ctx = CGLGetCurrentContext(); - + CGLContextObj ctx = [[self openGLContext] CGLContextObj]; // Enable the multithreading CGLEnable( ctx, kCGLCEMPEngine); - + GLenum err = glGetError(); +// GLint newSwapInterval = 1; +// CGLSetParameter(ctx, kCGLCPSwapInterval, &newSwapInterval); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); glClearColor(1.0, 1.0, 1.0, 1.0); @@ -180,7 +182,13 @@ } - (void)loadTexturesFrom: (void*) lastBitsIndex subRectangle: (NSRect) subRect { + static void *previousLastBitsIndex=null; NSRect r=[self frame]; + if (!(previousLastBitsIndex == lastBitsIndex)) { + previousLastBitsIndex = lastBitsIndex; + glTextureRangeAPPLE(GL_TEXTURE_RECTANGLE_ARB, r.size.width*r.size.height*4,lastBitsIndex); + } + glViewport( subRect.origin.x,subRect.origin.y, subRect.size.width,subRect.size.height ); char *subimg = ((char*)lastBitsIndex) + (unsigned int)(subRect.origin.x + (r.size.height-subRect.origin.y-subRect.size.height)*r.size.width)*4; glTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, subRect.size.width, subRect.size.height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, subimg ); @@ -255,8 +263,6 @@ [self setupOpenGL]; inited=YES; } - if (syncNeeded) - glFlush(); [self loadTexturesFrom:dispBitsIndex subRectangle: rect]; [self defineQuad:rect]; syncNeeded = YES; Modified: trunk/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist 2010-08-29 05:20:46 UTC (rev 2267) +++ trunk/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist 2010-08-31 04:00:50 UTC (rev 2268) @@ -350,7 +350,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleGetInfoString</key> - <string>Squeak VM 5.8b4 http://www.squeak.org</string> + <string>Squeak VM 5.8b5 http://www.squeak.org</string> <key>CFBundleIconFile</key> <string>Squeak.icns</string> <key>CFBundleIdentifier</key> @@ -362,11 +362,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>5.8b4</string> + <string>5.8b5</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> - <string>22.0</string> + <string>23.0</string> <key>LSBackgroundOnly</key> <false/> <key>LSMinimumSystemVersion</key>

1 0

Re: [squeak-dev] bitShift: optimisation on COG [WAS: DigitalSignatureAlgorithm>>#initRandomNonInteractivelyisnot random]
by Levente Uzonyi 30 Aug '10

30 Aug '10

On Sun, 29 Aug 2010, Nicolas Cellier wrote: > 2010/8/29 Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com>: >> 2010/8/29 Levente Uzonyi <leves(a)elte.hu>: >>> >>> snip... >>> >>>> Maybe http://bugs.squeak.org/view.php?id=7109 would serve a bit too... >>> >>> Hm. This looks interresting, I guess some optimizations are already >>> implemented: >>> >>> | x | >>> x := SmallInteger maxVal raisedTo: 100. >>> #(-1600 -1597 1597 1600) collect: [ :shift | >>> [ 1 to: 100000 do: [ :i | x bitShift: shift ] ] timeToRun ]. >>> "CogVM ===> #(150 147 271 64)" >>> "SquakVM ===> #(97 118 343 71)" >>> > > I regenerated COG, and I get: > > Original COG > #(281 292 621 275) > #(284 290 604 271) > COG + 7109 > #(167 239 509 289) > #(172 246 500 288) > Oops, it was development build... > > So I retried with deployment: > Original COG > #(116 114 219 65) > #(116 113 219 65) > COG + 7109 > #(47 77 120 61) > #(46 75 120 61) > > So I think yes, the patch should better be integrated. > It's only a small contributor of crypto timings, but it counts. Cool. It's time to move this thread to the vm-dev list to get these patches into the vm trunk. Levente > > Nicolas > >>> >>> Levente >>> >> >> I should have a look at source then... >> > >

1 0

Re: [squeak-dev] Experimental Cocoa OS-X based Squeak Cog JIT VM 5.8b4.
by Eliot Miranda 29 Aug '10

29 Aug '10

On Sun, Aug 29, 2010 at 1:31 PM, Bert Freudenberg <bert(a)freudenbergs.de>wrote: > > On 29.08.2010, at 22:22, Eliot Miranda wrote: > > > > On Sun, Aug 29, 2010 at 12:56 PM, Ken G. Brown <kbrown(a)mac.com> wrote: > >> Running a fresh Squeak4.2-10382-alpha on your latest 5.8b4. >> >> Open image, do Save As new version. then quit. >> Attempt to open saved new version image on Squeak 4.2.4beta1U.app by >> dragging and dropping on VM, it does not open. >> Console message: >> 10/08/29 1:51:57 PM [0x0-0x2fe2fe].org.squeak.Squeak[8275] This >> interpreter (vers. 6502) cannot read image file (vers. 6505). >> > > John's 5.8b4 is a Cog VM. Once an image is saved on Cog it will only run > on a Cog VM. > > cheers > Eliot > > > I'm sure you mentioned it before, but where can I read about the image > format changes? > Lazily I've yet to write this up. But I think the only change above and beyond support for the closure bytecodes (and not using BlockContext at all) is that image float order now depends on platform, so on x86 it is little-endian; this was forced by the JIT implementation of floating-point arithmetic (its hard to byte swap efficiently given the lack of sophistication of the code generator), and by my not wanting to waste cycles converting to/from big-endian byte order on image load/save or image segment export. Bit 1 of the image header flags word (which used to contain only the full screen flag) is 1 if the image's floats are little-endian. So the existing VMs would need to read and write this bit and either convert back to big-endian or copy the Cog VMs in keeping floats in platform-specific order. For me throwing performance away on each floating-point op on x86 is a heinous sin, so at least internally floats should be little-endian. The basicAt: & basicAt:put: primitives 38 & 39 need to be implemented to present floats as big endian to the image level. There are other changes to the image header, using unused bits and fields to store Cog-specific info and it would be convenient if the standard VMs preserve these fields. But they don't prevent loading on a standard VM; IIRC only the float-order changes would cause errors running a Cog image on a closure-enabled Interpreter VM. If people think this is important enough I could put together a change set for VMMaker that includes the relevant changes (to image load/save, floating-point arithmetic, image segment load/store and float at:/at:put:). best Eliot > - Bert - > > > > > >

2 1

[commit] r2267 - iOS 3.8b4 cog jit vm testing, optimize open/gl calls, fix for cursor keys
by commits＠squeakvm.org 29 Aug '10

29 Aug '10

Author: johnmci Date: 2010-08-28 22:20:46 -0700 (Sat, 28 Aug 2010) New Revision: 2267 Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.h trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj Log: iOS 3.8b4 cog jit vm testing, optimize open/gl calls, fix for cursor keys Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.h =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.h 2010-08-28 07:03:11 UTC (rev 2266) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.h 2010-08-29 05:20:46 UTC (rev 2267) @@ -53,6 +53,7 @@ BOOL dragInProgress; int dragCount; BOOL firstDrawCompleted; + BOOL syncNeeded; NSMutableArray* dragItems; CGDisplayFadeReservationToken fadeToken; NSRect savedScreenBoundsAtTimeOfFullScreen; Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m 2010-08-28 07:03:11 UTC (rev 2266) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m 2010-08-29 05:20:46 UTC (rev 2267) @@ -134,6 +134,7 @@ [self displayIfNeeded]; // NSLog(@"drawTheLayers flushHappened"); glFlush(); + syncNeeded = NO; } if (!firstDrawCompleted) { firstDrawCompleted = YES; @@ -166,7 +167,7 @@ glEnable(GL_TEXTURE_RECTANGLE_ARB); glTexParameterf(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_PRIORITY, 0.0); glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE); + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_SHARED_APPLE); glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); @@ -175,6 +176,7 @@ GLuint dt = 1; glDeleteTextures(1, &dt); glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 1); + syncNeeded = NO; } - (void)loadTexturesFrom: (void*) lastBitsIndex subRectangle: (NSRect) subRect { @@ -253,8 +255,11 @@ [self setupOpenGL]; inited=YES; } + if (syncNeeded) + glFlush(); [self loadTexturesFrom:dispBitsIndex subRectangle: rect]; [self defineQuad:rect]; + syncNeeded = YES; } } Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 2010-08-28 07:03:11 UTC (rev 2266) +++ trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 2010-08-29 05:20:46 UTC (rev 2267) @@ -370,17 +370,12 @@ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>42</integer> - <integer>23</integer> - <integer>21</integer> - <integer>20</integer> - <integer>3</integer> - <integer>2</integer> - <integer>0</integer> + <integer>243</integer> + <integer>241</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 822}, {443, 919}}</string> + <string>{{0, 3416}, {443, 919}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -429,7 +424,7 @@ <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>940C29C91228C5630009E415</string> + <string>94AB33271229A40800F77B62</string> <key>history</key> <array> <string>94BCE7390DDDEF8200F38F31</string> @@ -695,14 +690,17 @@ <string>94A3ED8C1228429500DF449D</string> <string>94A3EE5D122845D700DF449D</string> <string>94D12BE412289C66006B7504</string> - <string>94D12BE512289C66006B7504</string> <string>940C29211228BDC80009E415</string> <string>940C29221228BDC80009E415</string> <string>940C293D1228BE370009E415</string> <string>940C29711228C1260009E415</string> <string>940C297D1228C1FC0009E415</string> <string>940C29C71228C4F40009E415</string> - <string>940C29B21228C4A30009E415</string> + <string>947E96231228DB0D0065B3BA</string> + <string>947E96251228DB0D0065B3BA</string> + <string>944EB0211228E96100EF9C64</string> + <string>94AB32B612299AFC00F77B62</string> + <string>94AB33261229A40800F77B62</string> </array> </dict> <key>SplitCount</key> @@ -714,14 +712,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1088, 892}}</string> + <string>{{0, 0}, {1088, 886}}</string> <key>RubberWindowFrame</key> <string>124 50 1553 978 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>892pt</string> + <string>886pt</string> </dict> <dict> <key>ContentConfiguration</key> @@ -734,14 +732,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 897}, {1088, 40}}</string> + <string>{{0, 891}, {1088, 46}}</string> <key>RubberWindowFrame</key> <string>124 50 1553 978 0 0 1680 1028 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> - <string>40pt</string> + <string>46pt</string> </dict> </array> <key>Proportion</key> @@ -760,9 +758,9 @@ </array> <key>TableOfContents</key> <array> - <string>940C28CD1228B8620009E415</string> + <string>94AB33281229A40800F77B62</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>940C28CE1228B8620009E415</string> + <string>94AB33291229A40800F77B62</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -883,7 +881,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>304661859.44390798</real> + <real>304718856.68027002</real> <key>ToolbarDisplayMode</key> <integer>1</integer> <key>ToolbarIsVisible</key> @@ -898,13 +896,7 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>1C530D57069F1CE1000CFCEE</string> - <string>940C296D1228BFE80009E415</string> - <string>940C296E1228BFE80009E415</string> - <string>9488792B0E0F2F8000555242</string> - <string>1CD10A99069EF8BA00B06720</string> <string>9424FF6E0DDCB226009912BF</string> - <string>1C78EAAD065D492600B07095</string> <string>/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjc.xcodeproj</string> </array> <key>WindowString</key> @@ -929,7 +921,7 @@ <key>PBXProjectModuleGUID</key> <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> - <string>DropPlugin.c</string> + <string></string> <key>StatusBarVisibility</key> <true/> </dict> @@ -946,8 +938,6 @@ <string>736pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -987,7 +977,7 @@ <key>TableOfContents</key> <array> <string>9424FF6E0DDCB226009912BF</string> - <string>940C28BF1228B8160009E415</string> + <string>94AB332A1229A40800F77B62</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> @@ -998,7 +988,7 @@ <key>WindowToolGUID</key> <string>9424FF6E0DDCB226009912BF</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> @@ -1029,8 +1019,8 @@ <string>yes</string> <key>sizes</key> <array> - <string>{{0, 0}, {150, 478}}</string> - <string>{{150, 0}, {1226, 478}}</string> + <string>{{0, 0}, {150, 491}}</string> + <string>{{150, 0}, {1226, 491}}</string> </array> </dict> <key>VerticalSplitView</key> @@ -1045,8 +1035,8 @@ <string>yes</string> <key>sizes</key> <array> - <string>{{0, 0}, {1376, 478}}</string> - <string>{{0, 478}, {1376, 449}}</string> + <string>{{0, 0}, {1376, 491}}</string> + <string>{{0, 491}, {1376, 436}}</string> </array> </dict> </dict> @@ -1079,7 +1069,7 @@ <real>713</real> </array> <key>Frame</key> - <string>{{150, 0}, {1226, 478}}</string> + <string>{{150, 0}, {1226, 491}}</string> <key>RubberWindowFrame</key> <string>557 60 1376 968 0 0 1680 1028 </string> </dict> @@ -1107,13 +1097,13 @@ <key>TableOfContents</key> <array> <string>1CD10A99069EF8BA00B06720</string> - <string>940C28C01228B8160009E415</string> + <string>94AB327812298EE300F77B62</string> <string>1C162984064C10D400B95A72</string> - <string>940C28C11228B8160009E415</string> - <string>940C28C21228B8160009E415</string> - <string>940C28C31228B8160009E415</string> - <string>940C28C41228B8160009E415</string> - <string>940C28C51228B8160009E415</string> + <string>94AB327912298EE300F77B62</string> + <string>94AB327A12298EE300F77B62</string> + <string>94AB327B12298EE300F77B62</string> + <string>94AB327C12298EE300F77B62</string> + <string>94AB327D12298EE300F77B62</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debugV3</string> @@ -1140,14 +1130,12 @@ <key>Dock</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> - <string>sqMacV2Memory.c</string> + <string>sqSqueakOSXNSView.m</string> <key>StatusBarVisibility</key> <true/> </dict> @@ -1156,7 +1144,7 @@ <key>Frame</key> <string>{{0, 0}, {1417, 512}}</string> <key>RubberWindowFrame</key> - <string>141 4 1417 1024 0 0 1680 1028 </string> + <string>263 4 1417 1024 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -1168,6 +1156,8 @@ <string>512pt</string> </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -1180,7 +1170,7 @@ <key>Frame</key> <string>{{0, 517}, {1417, 466}}</string> <key>RubberWindowFrame</key> - <string>141 4 1417 1024 0 0 1680 1028 </string> + <string>263 4 1417 1024 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXProjectFindModule</string> @@ -1203,17 +1193,17 @@ <key>TableOfContents</key> <array> <string>1C530D57069F1CE1000CFCEE</string> - <string>940C29A71228C4800009E415</string> - <string>940C29A81228C4800009E415</string> + <string>94AB32AA1229995C00F77B62</string> + <string>94AB32AB1229995C00F77B62</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> - <string>141 4 1417 1024 0 0 1680 1028 </string> + <string>263 4 1417 1024 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> - <false/> + <true/> </dict> <dict> <key>Identifier</key> @@ -1232,8 +1222,6 @@ <key>Dock</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -1269,7 +1257,7 @@ <key>TableOfContents</key> <array> <string>1C78EAAD065D492600B07095</string> - <string>940C296B1228BFE80009E415</string> + <string>94AB327E12298EE300F77B62</string> <string>1C78EAAC065D492600B07095</string> </array> <key>ToolbarConfiguration</key> @@ -1279,7 +1267,7 @@ <key>WindowToolGUID</key> <string>1C78EAAD065D492600B07095</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser 2010-08-28 07:03:11 UTC (rev 2266) +++ trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser 2010-08-29 05:20:46 UTC (rev 2267) @@ -32,12 +32,12 @@ 1D6058900D05DD3D006BFB54 /* SqueakNoOGLIPhone */, ); breakpoints = ( - 94D7181B10B74A2500F69A71 /* sqSqueakOSXNSView.m:477 */, - 94D7181D10B74A2600F69A71 /* sqSqueakOSXNSView.m:473 */, - 94D7182310B74A2900F69A71 /* sqSqueakOSXNSView.m:461 */, - 94D7182910B74A4A00F69A71 /* sqSqueakOSXNSView.m:449 */, - 94D7182D10B74A4E00F69A71 /* sqSqueakOSXNSView.m:457 */, - 94D7183310B74BD100F69A71 /* sqSqueakOSXNSView.m:489 */, + 94D7181B10B74A2500F69A71 /* sqSqueakOSXNSView.m:483 */, + 94D7181D10B74A2600F69A71 /* sqSqueakOSXNSView.m:479 */, + 94D7182310B74A2900F69A71 /* sqSqueakOSXNSView.m:467 */, + 94D7182910B74A4A00F69A71 /* sqSqueakOSXNSView.m:455 */, + 94D7182D10B74A4E00F69A71 /* sqSqueakOSXNSView.m:463 */, + 94D7183310B74BD100F69A71 /* sqSqueakOSXNSView.m:495 */, 94A1B1B810B9C1A800C64473 /* sqMacUIEventsUniversal.c:1429 */, 945C4E6310BB29B500548CC1 /* sqSqueakFileDirectoryInterface.m:118 */, 945C4E8010BB2CE000548CC1 /* sqSqueakFileDirectoryInterface.m:102 */, @@ -45,9 +45,9 @@ 9428BCDC10BB937100DAD287 /* sqSqueakFileDirectoryInterface.m:219 */, 9428BD7010BBA1DC00DAD287 /* sqSqueakFileDirectoryInterface.m:180 */, 9428BD7710BBA26000DAD287 /* sqSqueakFileDirectoryInterface.m:205 */, - 94F5F28710BC517200847EEE /* sqSqueakOSXNSView.m:444 */, - 94F5F28B10BC517500847EEE /* sqSqueakOSXNSView.m:465 */, - 94F5F28D10BC517700847EEE /* sqSqueakOSXNSView.m:469 */, + 94F5F28710BC517200847EEE /* sqSqueakOSXNSView.m:450 */, + 94F5F28B10BC517500847EEE /* sqSqueakOSXNSView.m:471 */, + 94F5F28D10BC517700847EEE /* sqSqueakOSXNSView.m:475 */, 946DA99210C0CE1900F26F56 /* sqSqueakOSXDropAPI.m:79 */, 946DAB1210C0F00400F26F56 /* sqMacUnixExternalPrims.m:219 */, 9476030E10C375C300B621C9 /* sqSqueakOSXApplication.m:260 */, @@ -65,13 +65,13 @@ 9458527F10F045FB001401E7 /* sqSqueakIPhoneClipboardAPI.m:31 */, 9458528110F045FC001401E7 /* sqSqueakIPhoneClipboardAPI.m:24 */, 9458528310F045FD001401E7 /* sqSqueakIPhoneClipboardAPI.m:17 */, - 9496D5CD10FAFA29007762DE /* sqSqueakOSXNSView.m:364 */, - 940CD10B110E3E4D00A9344A /* sqSqueakOSXNSView.m:544 */, + 9496D5CD10FAFA29007762DE /* sqSqueakOSXNSView.m:370 */, + 940CD10B110E3E4D00A9344A /* sqSqueakOSXNSView.m:550 */, 940CD113110E3E6500A9344A /* sqSqueakOSXDropAPI.m:53 */, 94C0D1AC112D5DAE00213581 /* sqSqueakScreenAPI.m:79 */, 941C24EF1198BBE3008BF398 /* sqSqueakScreenAndWindow.m:96 */, - 941DE81D1227AB450027D899 /* sqSqueakOSXNSView.m:323 */, - 941DE8221227AB710027D899 /* sqSqueakOSXNSView.m:420 */, + 941DE81D1227AB450027D899 /* sqSqueakOSXNSView.m:329 */, + 941DE8221227AB710027D899 /* sqSqueakOSXNSView.m:426 */, ); codeSenseManager = 9424FF430DDC8673009912BF /* Code sense */; executables = ( @@ -144,7 +144,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 22, 300, - 692.58349609375, + 737, ); PBXFileTableDataSourceColumnsKey = ( PBXExecutablesDataSource_ActiveFlagID, @@ -231,7 +231,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 765, + 809, 60, 20, 48, @@ -248,8 +248,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 304658390; - PBXWorkspaceStateSaveDate = 304658390; + PBXPerProjectTemplateStateSaveDate = 304718750; + PBXWorkspaceStateSaveDate = 304718750; }; perUserProjectItems = { 9402DC9C10CDB5F3005C2102 /* PBXTextBookmark */ = 9402DC9C10CDB5F3005C2102 /* PBXTextBookmark */; @@ -262,9 +262,7 @@ 940C293D1228BE370009E415 /* PBXTextBookmark */ = 940C293D1228BE370009E415 /* PBXTextBookmark */; 940C29711228C1260009E415 /* PBXTextBookmark */ = 940C29711228C1260009E415 /* PBXTextBookmark */; 940C297D1228C1FC0009E415 /* PBXTextBookmark */ = 940C297D1228C1FC0009E415 /* PBXTextBookmark */; - 940C29B21228C4A30009E415 /* PBXTextBookmark */ = 940C29B21228C4A30009E415 /* PBXTextBookmark */; 940C29C71228C4F40009E415 /* PBXTextBookmark */ = 940C29C71228C4F40009E415 /* PBXTextBookmark */; - 940C29C91228C5630009E415 /* PBXTextBookmark */ = 940C29C91228C5630009E415 /* PBXTextBookmark */; 940CA58B1226E9B2008BF48A /* PBXTextBookmark */ = 940CA58B1226E9B2008BF48A /* PBXTextBookmark */; 941441FD10BC817D0088F8AC /* PBXTextBookmark */ = 941441FD10BC817D0088F8AC /* PBXTextBookmark */; 9414420110BC817D0088F8AC /* PBXTextBookmark */ = 9414420110BC817D0088F8AC /* PBXTextBookmark */; @@ -306,6 +304,7 @@ 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */ = 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */; 9449127012260EF400DC049E /* PBXTextBookmark */ = 9449127012260EF400DC049E /* PBXTextBookmark */; 944912841226106200DC049E /* PBXTextBookmark */ = 944912841226106200DC049E /* PBXTextBookmark */; + 944EB0211228E96100EF9C64 /* PBXTextBookmark */ = 944EB0211228E96100EF9C64 /* PBXTextBookmark */; 94547F160DE0AC7D00DD588F /* PBXTextBookmark */ = 94547F160DE0AC7D00DD588F /* PBXTextBookmark */; 945481A60DE2A79200DD588F /* PBXTextBookmark */ = 945481A60DE2A79200DD588F /* PBXTextBookmark */; 94554E670DF1171500FB176B /* PBXTextBookmark */ = 94554E670DF1171500FB176B /* PBXTextBookmark */; @@ -355,6 +354,8 @@ 947E644910AA0F2C00D3B69E /* PBXTextBookmark */ = 947E644910AA0F2C00D3B69E /* PBXTextBookmark */; 947E644B10AA0F2C00D3B69E /* PBXTextBookmark */ = 947E644B10AA0F2C00D3B69E /* PBXTextBookmark */; 947E645010AA0F2C00D3B69E /* PBXTextBookmark */ = 947E645010AA0F2C00D3B69E /* PBXTextBookmark */; + 947E96231228DB0D0065B3BA /* PBXTextBookmark */ = 947E96231228DB0D0065B3BA /* PBXTextBookmark */; + 947E96251228DB0D0065B3BA /* PBXTextBookmark */ = 947E96251228DB0D0065B3BA /* PBXTextBookmark */; 9483EAF9121C60C70070C43B /* PBXTextBookmark */ = 9483EAF9121C60C70070C43B /* PBXTextBookmark */; 9483EAFA121C60C70070C43B /* PBXTextBookmark */ = 9483EAFA121C60C70070C43B /* PBXTextBookmark */; 9483EAFB121C60C70070C43B /* PBXTextBookmark */ = 9483EAFB121C60C70070C43B /* PBXTextBookmark */; @@ -410,6 +411,9 @@ 94A3EE5D122845D700DF449D /* PlistBookmark */ = 94A3EE5D122845D700DF449D /* PlistBookmark */; 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */; 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */; + 94AB32B612299AFC00F77B62 /* PBXTextBookmark */ = 94AB32B612299AFC00F77B62 /* PBXTextBookmark */; + 94AB33261229A40800F77B62 /* PBXTextBookmark */ = 94AB33261229A40800F77B62 /* PBXTextBookmark */; + 94AB33271229A40800F77B62 /* PBXTextBookmark */ = 94AB33271229A40800F77B62 /* PBXTextBookmark */; 94B1514E0DE2CE530059F208 /* PBXTextBookmark */ = 94B1514E0DE2CE530059F208 /* PBXTextBookmark */; 94B7898910C4F95E005EA70D /* PBXTextBookmark */ = 94B7898910C4F95E005EA70D /* PBXTextBookmark */; 94B88C560E81500200C98131 /* PBXTextBookmark */ = 94B88C560E81500200C98131 /* PBXTextBookmark */; @@ -443,7 +447,6 @@ 94D051D3120CE2D40039F8B7 /* PBXTextBookmark */ = 94D051D3120CE2D40039F8B7 /* PBXTextBookmark */; 94D0520F120CE6650039F8B7 /* PBXTextBookmark */ = 94D0520F120CE6650039F8B7 /* PBXTextBookmark */; 94D12BE412289C66006B7504 /* PBXTextBookmark */ = 94D12BE412289C66006B7504 /* PBXTextBookmark */; - 94D12BE512289C66006B7504 /* PBXTextBookmark */ = 94D12BE512289C66006B7504 /* PBXTextBookmark */; 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */ = 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */; 94D16BFE10BCEFEE00A69A89 /* PBXTextBookmark */ = 94D16BFE10BCEFEE00A69A89 /* PBXTextBookmark */; 94D16C2A10BCF28A00A69A89 /* PBXTextBookmark */ = 94D16C2A10BCF28A00A69A89 /* PBXTextBookmark */; @@ -742,16 +745,6 @@ vrLen = 4604; vrLoc = 1894; }; - 940C29B21228C4A30009E415 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - name = "sqSqueakOSXNSView.m: 118"; - rLen = 0; - rLoc = 4090; - rType = 0; - vrLen = 2090; - vrLoc = 3779; - }; 940C29C71228C4F40009E415 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94E658E00DDD03FE00358328 /* interp.c */; @@ -762,16 +755,6 @@ vrLen = 2071; vrLoc = 802259; }; - 940C29C91228C5630009E415 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - name = "sqSqueakOSXNSView.m: 118"; - rLen = 0; - rLoc = 4090; - rType = 0; - vrLen = 2194; - vrLoc = 3779; - }; 940CA5401226E8D5008BF48A /* mpeg3io.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; @@ -789,7 +772,7 @@ vrLen = 2211; vrLoc = 0; }; - 940CD10B110E3E4D00A9344A /* sqSqueakOSXNSView.m:544 */ = { + 940CD10B110E3E4D00A9344A /* sqSqueakOSXNSView.m:550 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -801,9 +784,9 @@ functionName = "-draggingExited:"; hitCount = 0; ignoreCount = 0; - lineNumber = 544; + lineNumber = 550; location = Squeak; - modificationTime = 304661666.500072; + modificationTime = 304716122.9385511; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -820,7 +803,7 @@ ignoreCount = 0; lineNumber = 53; location = Squeak; - modificationTime = 304661666.541146; + modificationTime = 304716122.961531; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -929,7 +912,7 @@ ignoreCount = 0; lineNumber = 96; location = Squeak; - modificationTime = 304661662.315874; + modificationTime = 304716121.238479; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -989,7 +972,7 @@ path = "/Users/johnmci/Documents/Squeak/Disney Related Changes/plugin-build/Squeak3DX/SqueakGL.c"; sourceTree = "<absolute>"; }; - 941DE81D1227AB450027D899 /* sqSqueakOSXNSView.m:323 */ = { + 941DE81D1227AB450027D899 /* sqSqueakOSXNSView.m:329 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1001,13 +984,13 @@ functionName = "-dealWithOpenStepChars:"; hitCount = 0; ignoreCount = 0; - lineNumber = 323; + lineNumber = 329; location = Squeak; - modificationTime = 304661666.600198; + modificationTime = 304716123.005803; originalNumberOfMultipleMatches = 1; state = 1; }; - 941DE8221227AB710027D899 /* sqSqueakOSXNSView.m:420 */ = { + 941DE8221227AB710027D899 /* sqSqueakOSXNSView.m:426 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1019,9 +1002,9 @@ functionName = "-doCommandBySelector:"; hitCount = 0; ignoreCount = 0; - lineNumber = 420; + lineNumber = 426; location = Squeak; - modificationTime = 304661666.627954; + modificationTime = 304716123.0294889; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -1417,7 +1400,7 @@ ignoreCount = 0; lineNumber = 59; location = Squeak; - modificationTime = 304661662.315289; + modificationTime = 304716121.237221; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -1435,7 +1418,7 @@ ignoreCount = 0; lineNumber = 219; location = Squeak; - modificationTime = 304661662.315302; + modificationTime = 304716121.2372431; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -1453,7 +1436,7 @@ ignoreCount = 0; lineNumber = 180; location = Squeak; - modificationTime = 304661662.315317; + modificationTime = 304716121.237268; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -1471,7 +1454,7 @@ ignoreCount = 0; lineNumber = 205; location = Squeak; - modificationTime = 304661662.31534; + modificationTime = 304716121.237292; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2033,6 +2016,16 @@ vrLen = 2839; vrLoc = 12002; }; + 944EB0211228E96100EF9C64 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E96281228DB0D0065B3BA /* sqMacOpenGL.c */; + name = "sqMacOpenGL.c: 36"; + rLen = 26; + rLoc = 1218; + rType = 0; + vrLen = 1982; + vrLoc = 0; + }; 9452BDC10F4095DE006410DE /* sqSqueakIPhoneApplication+Network.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1036, 652}}"; @@ -2446,7 +2439,7 @@ ignoreCount = 0; lineNumber = 101; location = Squeak; - modificationTime = 304661666.070802; + modificationTime = 304716122.610724; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2464,7 +2457,7 @@ ignoreCount = 0; lineNumber = 69; location = Squeak; - modificationTime = 304661666.130565; + modificationTime = 304716122.635554; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2482,7 +2475,7 @@ ignoreCount = 0; lineNumber = 75; location = Squeak; - modificationTime = 304661666.165129; + modificationTime = 304716122.681887; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2515,7 +2508,7 @@ ignoreCount = 0; lineNumber = 37; location = Squeak; - modificationTime = 304661666.225319; + modificationTime = 304716122.704797; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2532,7 +2525,7 @@ ignoreCount = 0; lineNumber = 45; location = Squeak; - modificationTime = 304661666.282176; + modificationTime = 304716122.749935; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2549,7 +2542,7 @@ ignoreCount = 0; lineNumber = 50; location = Squeak; - modificationTime = 304661666.346521; + modificationTime = 304716122.774346; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2566,7 +2559,7 @@ ignoreCount = 0; lineNumber = 72; location = Squeak; - modificationTime = 304661666.387487; + modificationTime = 304716122.819034; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2583,7 +2576,7 @@ ignoreCount = 0; lineNumber = 88; location = Squeak; - modificationTime = 304661666.435488; + modificationTime = 304716122.863331; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2627,7 +2620,7 @@ hitCount = 0; ignoreCount = 0; lineNumber = 31; - modificationTime = 304661662.315739; + modificationTime = 304716121.238065; originalNumberOfMultipleMatches = 1; state = 0; }; @@ -2643,7 +2636,7 @@ hitCount = 0; ignoreCount = 0; lineNumber = 24; - modificationTime = 304661662.315754; + modificationTime = 304716121.238089; originalNumberOfMultipleMatches = 1; state = 0; }; @@ -2659,7 +2652,7 @@ hitCount = 0; ignoreCount = 0; lineNumber = 17; - modificationTime = 304661662.315777; + modificationTime = 304716121.238112; originalNumberOfMultipleMatches = 1; state = 0; }; @@ -2711,7 +2704,7 @@ ignoreCount = 0; lineNumber = 118; location = Squeak; - modificationTime = 304661662.315247; + modificationTime = 304716121.237175; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2729,7 +2722,7 @@ ignoreCount = 0; lineNumber = 102; location = Squeak; - modificationTime = 304661662.315272; + modificationTime = 304716121.2371989; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -3001,7 +2994,7 @@ ignoreCount = 0; lineNumber = 79; location = Squeak; - modificationTime = 304661665.801686; + modificationTime = 304716122.394802; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -3078,7 +3071,7 @@ ignoreCount = 0; lineNumber = 219; location = Squeak; - modificationTime = 304661665.839168; + modificationTime = 304716122.42917; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -3238,7 +3231,7 @@ ignoreCount = 0; lineNumber = 260; location = Squeak; - modificationTime = 304661665.934478; + modificationTime = 304716122.491248; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -3256,7 +3249,7 @@ ignoreCount = 0; lineNumber = 265; location = Squeak; - modificationTime = 304661665.978907; + modificationTime = 304716122.534033; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -3274,7 +3267,7 @@ ignoreCount = 0; lineNumber = 117; location = Squeak; - modificationTime = 304661662.315547; + modificationTime = 304716121.237838; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -3537,7 +3530,7 @@ 242, ); autoAttachOnCrash = 1; - breakpointsEnabled = 0; + breakpointsEnabled = 1; configStateDict = { "PBXLSLaunchAction-0" = { PBXLSLaunchAction = 0; @@ -3740,6 +3733,47 @@ sepNavWindowFrame = "{{522, 48}, {1017, 978}}"; }; }; + 947E96231228DB0D0065B3BA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E96241228DB0D0065B3BA /* sqWin32OpenGL.c */; + name = "sqWin32OpenGL.c: 23"; + rLen = 0; + rLoc = 650; + rType = 0; + vrLen = 1947; + vrLoc = 0; + }; + 947E96241228DB0D0065B3BA /* sqWin32OpenGL.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = sqWin32OpenGL.c; + path = "/Users/johnmci/Documents/SqueakHydraZBaseCheck/HydraVM-src/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c"; + sourceTree = "<absolute>"; + }; + 947E96251228DB0D0065B3BA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E96261228DB0D0065B3BA /* sqOpenGLRenderer.c */; + name = "sqOpenGLRenderer.c: 268"; + rLen = 20; + rLoc = 8356; + rType = 0; + vrLen = 1808; + vrLoc = 7505; + }; + 947E96261228DB0D0065B3BA /* sqOpenGLRenderer.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = sqOpenGLRenderer.c; + path = /Users/johnmci/Documents/SqueakExuperyPlugin/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c; + sourceTree = "<absolute>"; + }; + 947E96281228DB0D0065B3BA /* sqMacOpenGL.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = sqMacOpenGL.c; + path = "/Volumes/330GB Photos/Cog Before Aug 2010 changes/platforms/Mac OS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c"; + sourceTree = "<absolute>"; + }; 9483EAF9121C60C70070C43B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 949E5DB50DE3AB6A007388E0 /* SqueakUIView.h */; @@ -4171,11 +4205,11 @@ ignoreCount = 0; lineNumber = 235; location = Squeak; - modificationTime = 304661666.042408; + modificationTime = 304716122.5675389; originalNumberOfMultipleMatches = 1; state = 1; }; - 9496D5CD10FAFA29007762DE /* sqSqueakOSXNSView.m:364 */ = { + 9496D5CD10FAFA29007762DE /* sqSqueakOSXNSView.m:370 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -4187,9 +4221,9 @@ functionName = "-doCommandBySelector:"; hitCount = 0; ignoreCount = 0; - lineNumber = 364; + lineNumber = 370; location = Squeak; - modificationTime = 304661662.315794; + modificationTime = 304716121.23814; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -4384,7 +4418,7 @@ ignoreCount = 0; lineNumber = 1429; location = "Squeak VM Opt"; - modificationTime = 304661662.31523; + modificationTime = 304716121.2371489; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -4689,6 +4723,36 @@ path = "/Users/johnmci/Documents/SqueakBrowserPlugin/platforms/Mac OS/vm/npsqueak copy/npsqueak.c"; sourceTree = "<absolute>"; }; + 94AB32B612299AFC00F77B62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */; + name = "sqSqueakOSXNSView.h: 56"; + rLen = 10; + rLoc = 2337; + rType = 0; + vrLen = 2797; + vrLoc = 844; + }; + 94AB33261229A40800F77B62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; + name = "sqSqueakOSXNSView.m: 258"; + rLen = 10; + rLoc = 8392; + rType = 0; + vrLen = 1984; + vrLoc = 7504; + }; + 94AB33271229A40800F77B62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; + name = "sqSqueakOSXNSView.m: 258"; + rLen = 10; + rLoc = 8392; + rType = 0; + vrLen = 1984; + vrLoc = 7504; + }; 94B1514E0DE2CE530059F208 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94B1514F0DE2CE530059F208 /* sqMacWindowUniversal.c */; @@ -4820,12 +4884,6 @@ name = NSApplication.h; path = /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/AppKit.framework/Versions/C/Headers/NSApplication.h; sourceTree = "<absolute>"; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {3652, 5811}}"; - sepNavSelRange = "{13541, 43}"; - sepNavVisRange = "{12028, 3678}"; - sepNavWindowFrame = "{{15, 4}, {1042, 1024}}"; - }; }; 94BCABBF10AB72A600F87527 /* sqSqueakOSXFileDirectoryInterface.h */ = { uiCtxt = { @@ -5086,23 +5144,23 @@ ignoreCount = 0; lineNumber = 79; location = Squeak; - modificationTime = 304661662.315858; + modificationTime = 304716121.238456; originalNumberOfMultipleMatches = 1; state = 2; }; 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1279, 1118}}"; - sepNavSelRange = "{3616, 0}"; - sepNavVisRange = "{711, 2935}"; + sepNavIntBoundsRect = "{{0, 0}, {1039, 1131}}"; + sepNavSelRange = "{2337, 10}"; + sepNavVisRange = "{844, 2797}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; }; }; 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 10205}}"; - sepNavSelRange = "{4090, 0}"; - sepNavVisRange = "{3779, 2194}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 10387}}"; + sepNavSelRange = "{8392, 10}"; + sepNavVisRange = "{7504, 1984}"; sepNavWindowFrame = "{{570, 7}, {1076, 1021}}"; }; }; @@ -5643,16 +5701,6 @@ vrLen = 1211; vrLoc = 71047; }; - 94D12BE512289C66006B7504 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */; - name = "sqSqueakOSXNSView.h: 71"; - rLen = 0; - rLoc = 3051; - rType = 0; - vrLen = 2405; - vrLoc = 1217; - }; 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94D16BFD10BCEFEE00A69A89 /* Document.m */; @@ -5966,7 +6014,7 @@ vrLen = 1347; vrLoc = 59154; }; - 94D7181B10B74A2500F69A71 /* sqSqueakOSXNSView.m:477 */ = { + 94D7181B10B74A2500F69A71 /* sqSqueakOSXNSView.m:483 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -5977,13 +6025,13 @@ fileReference = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; hitCount = 0; ignoreCount = 0; - lineNumber = 477; + lineNumber = 483; location = Squeak; - modificationTime = 304661662.315041; + modificationTime = 304716121.236092; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7181D10B74A2600F69A71 /* sqSqueakOSXNSView.m:473 */ = { + 94D7181D10B74A2600F69A71 /* sqSqueakOSXNSView.m:479 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -5995,13 +6043,13 @@ functionName = "-firstRectForCharacterRange:"; hitCount = 0; ignoreCount = 0; - lineNumber = 473; + lineNumber = 479; location = Squeak; - modificationTime = 304661662.315117; + modificationTime = 304716121.236487; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7182310B74A2900F69A71 /* sqSqueakOSXNSView.m:461 */ = { + 94D7182310B74A2900F69A71 /* sqSqueakOSXNSView.m:467 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -6013,13 +6061,13 @@ functionName = "-attributedSubstringFromRange:"; hitCount = 0; ignoreCount = 0; - lineNumber = 461; + lineNumber = 467; location = Squeak; - modificationTime = 304661662.315146; + modificationTime = 304716121.2366239; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7182910B74A4A00F69A71 /* sqSqueakOSXNSView.m:449 */ = { + 94D7182910B74A4A00F69A71 /* sqSqueakOSXNSView.m:455 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -6031,13 +6079,13 @@ functionName = "-unmarkText"; hitCount = 0; ignoreCount = 0; - lineNumber = 449; + lineNumber = 455; location = Squeak; - modificationTime = 304661662.315164; + modificationTime = 304716121.236757; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7182D10B74A4E00F69A71 /* sqSqueakOSXNSView.m:457 */ = { + 94D7182D10B74A4E00F69A71 /* sqSqueakOSXNSView.m:463 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -6049,13 +6097,13 @@ functionName = "-conversationIdentifier"; hitCount = 0; ignoreCount = 0; - lineNumber = 457; + lineNumber = 463; location = Squeak; - modificationTime = 304661662.315188; + modificationTime = 304716121.2368861; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7183310B74BD100F69A71 /* sqSqueakOSXNSView.m:489 */ = { + 94D7183310B74BD100F69A71 /* sqSqueakOSXNSView.m:495 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -6067,9 +6115,9 @@ functionName = "-drawsVerticallyForCharacterAtIndex:"; hitCount = 0; ignoreCount = 0; - lineNumber = 489; + lineNumber = 495; location = Squeak; - modificationTime = 304661662.315204; + modificationTime = 304716121.237016; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -7585,7 +7633,7 @@ vrLen = 1899; vrLoc = 192393; }; - 94F5F28710BC517200847EEE /* sqSqueakOSXNSView.m:444 */ = { + 94F5F28710BC517200847EEE /* sqSqueakOSXNSView.m:450 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -7597,13 +7645,13 @@ functionName = "-setMarkedText:selectedRange:replacementRange:"; hitCount = 0; ignoreCount = 0; - lineNumber = 444; + lineNumber = 450; location = Squeak; - modificationTime = 304661662.315367; + modificationTime = 304716121.237315; originalNumberOfMultipleMatches = 1; state = 2; }; - 94F5F28B10BC517500847EEE /* sqSqueakOSXNSView.m:465 */ = { + 94F5F28B10BC517500847EEE /* sqSqueakOSXNSView.m:471 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -7615,13 +7663,13 @@ functionName = "-markedRange"; hitCount = 0; ignoreCount = 0; - lineNumber = 465; + lineNumber = 471; location = Squeak; - modificationTime = 304661662.31538; + modificationTime = 304716121.237444; originalNumberOfMultipleMatches = 1; state = 2; }; - 94F5F28D10BC517700847EEE /* sqSqueakOSXNSView.m:469 */ = { + 94F5F28D10BC517700847EEE /* sqSqueakOSXNSView.m:475 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -7633,9 +7681,9 @@ functionName = "-selectedRange"; hitCount = 0; ignoreCount = 0; - lineNumber = 469; + lineNumber = 475; location = Squeak; - modificationTime = 304661662.315413; + modificationTime = 304716121.237573; originalNumberOfMultipleMatches = 1; state = 2; }; Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 2010-08-28 07:03:11 UTC (rev 2266) +++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 2010-08-29 05:20:46 UTC (rev 2267) @@ -270,7 +270,48 @@ </dict> </array> <key>OpenEditors</key> - <array/> + <array> + <dict> + <key>Content</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>94803497122A23DF00C42504</string> + <key>PBXProjectModuleLabel</key> + <string>sqSqueakOSXNSView.m</string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>94803498122A23DF00C42504</string> + <key>PBXProjectModuleLabel</key> + <string>sqSqueakOSXNSView.m</string> + <key>_historyCapacity</key> + <integer>0</integer> + <key>bookmark</key> + <string>9480349A122A23DF00C42504</string> + <key>history</key> + <array> + <string>94803499122A23DF00C42504</string> + </array> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <true/> + </dict> + <key>Geometry</key> + <dict> + <key>Frame</key> + <string>{{0, 20}, {1076, 924}}</string> + <key>PBXModuleWindowStatusBarHidden2</key> + <false/> + <key>RubberWindowFrame</key> + <string>10 63 1076 965 0 0 1680 1028 </string> + </dict> + </dict> + </array> <key>PerspectiveWidths</key> <array> <integer>-1</integer> @@ -302,8 +343,6 @@ <key>Layout</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXBottomSmartGroupGIDs</key> @@ -328,7 +367,7 @@ <key>PBXSmartGroupTreeModuleColumnWidthsKey</key> <array> <real>22</real> - <real>421</real> + <real>386</real> </array> <key>PBXSmartGroupTreeModuleColumnsKey_v4</key> <array> @@ -373,12 +412,17 @@ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>182</integer> - <integer>180</integer> + <integer>46</integer> + <integer>29</integer> + <integer>17</integer> + <integer>16</integer> + <integer>3</integer> + <integer>2</integer> + <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 339}, {443, 914}}</string> + <string>{{0, 513}, {408, 914}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -390,32 +434,34 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {460, 932}}</string> + <string>{{0, 0}, {425, 932}}</string> <key>GroupTreeTableConfiguration</key> <array> <string>SCMStatusColumn</string> <real>22</real> <string>MainColumn</string> - <real>421</real> + <real>386</real> </array> <key>RubberWindowFrame</key> - <string>38 55 1646 973 0 0 1680 1028 </string> + <string>12 55 1646 973 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXSmartGroupTreeModule</string> <key>Proportion</key> - <string>460pt</string> + <string>425pt</string> </dict> <dict> <key>Dock</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>sqSqueakOSXApplication.m</string> + <string>sqSqueakOSXScreenAndWindow.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> <key>Split0</key> @@ -423,14 +469,13 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>sqSqueakOSXApplication.m</string> + <string>sqSqueakOSXScreenAndWindow.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>940C2A3F1228C78C0009E415</string> + <string>94803494122A23DF00C42504</string> <key>history</key> <array> - <string>94BCE7390DDDEF8200F38F31</string> <string>94547F160DE0AC7D00DD588F</string> <string>945481A60DE2A79200DD588F</string> <string>94B1514E0DE2CE530059F208</string> @@ -450,7 +495,6 @@ <string>94AB2E6C0E003879006A79E4</string> <string>945F30FC0E0C763800CFF3DC</string> <string>948704AE0E12CABF00D565C3</string> - <string>948704B20E12CABF00D565C3</string> <string>9487071F0E132B1000D565C3</string> <string>94ED7EFA0E6C2ABE00F4DD03</string> <string>94B88C530E81500200C98131</string> @@ -468,8 +512,6 @@ <string>94638BD10EB0F98000A3F155</string> <string>94638CEA0EB16F1100A3F155</string> <string>947E210C0EB28486007957D0</string> - <string>9471E48A0EB6C393000AE79D</string> - <string>94476EC40EBFAB320095D6D7</string> <string>9478E13D0EC8EB46007096A7</string> <string>94E2DAD40ED2351B00012E92</string> <string>94E2DB270ED2355F00012E92</string> @@ -478,10 +520,6 @@ <string>947E61D610AA049300D3B69E</string> <string>947E61DA10AA049300D3B69E</string> <string>947E61DC10AA049300D3B69E</string> - <string>947E644910AA0F2C00D3B69E</string> - <string>947E644B10AA0F2C00D3B69E</string> - <string>947E644E10AA0F2C00D3B69E</string> - <string>947E645010AA0F2C00D3B69E</string> <string>942ABEC510AA34820086D908</string> <string>94BCAD4A10AB981B00F87527</string> <string>94BCAE9010ACA3A300F87527</string> @@ -502,8 +540,6 @@ <string>9484F86210B0DCC60038BDC0</string> <string>9484F86510B0DCC60038BDC0</string> <string>9484F8FC10B0E1770038BDC0</string> - <string>9484F9CE10B13E1C0038BDC0</string> - <string>94CA691410B1CAD8007F207C</string> <string>9456C24F10B2F268000BF3DE</string> <string>9456C25A10B2F2C9000BF3DE</string> <string>9456C32210B32F43000BF3DE</string> @@ -533,7 +569,6 @@ <string>94D7401510B5F8AF00F8C034</string> <string>94D7403810B5FDDB00F8C034</string> <string>94D7403A10B5FDDB00F8C034</string> - <string>94D7403C10B5FDDB00F8C034</string> <string>94D740B210B6242000F8C034</string> <string>9406E7E210B663F4002F81F2</string> <string>9406E87110B66A74002F81F2</string> @@ -587,7 +622,6 @@ <string>9430329A10BD103B0045D33B</string> <string>9430329B10BD103B0045D33B</string> <string>94E4930310BD32D00011AC75</string> - <string>94CFE4AF10BE3CA600847DF5</string> <string>94CFE6A910BE63A900847DF5</string> <string>94CFE6B810BE63A900847DF5</string> <string>94CFE6B910BE63A900847DF5</string> @@ -610,49 +644,30 @@ <string>946DAA3810C0D8B700F26F56</string> <string>946DAA3A10C0D8B700F26F56</string> <string>946DAA3C10C0D8B700F26F56</string> - <string>946DAB5110C0F2B000F26F56</string> <string>94F1F5C910C30C22008DB9CF</string> <string>947713D410C45E5F00890A9B</string> <string>94B7898910C4F95E005EA70D</string> - <string>9487755C10C64FF100E4AEC5</string> - <string>9487755D10C64FF100E4AEC5</string> - <string>9487756010C64FF100E4AEC5</string> <string>9402DDB610CE12A5005C2102</string> <string>94D3660B10CEE03900805023</string> - <string>94B954A010E6D0F700DC476A</string> <string>9493E98F10EE90BC000C4FB3</string> <string>9448940B10F3E8FF00FB3EC8</string> <string>947923F21102BC12007C87F8</string> <string>947923FE1102BE53007C87F8</string> - <string>947924171102E275007C87F8</string> <string>9473A95A1102F70B00D135CB</string> <string>9473A9701103BE0A00D135CB</string> <string>948C0820112DE98D0017EE7F</string> <string>94E8EEEA11C94D5D0049D853</string> <string>949DDD6D11D141080017F79B</string> - <string>9494933A11E5274B0019BC29</string> <string>9494934011E5274B0019BC29</string> - <string>9494934211E5274B0019BC29</string> - <string>9494934311E5274B0019BC29</string> <string>9494944B11E52D570019BC29</string> <string>949AD35211E54A81006D6BF4</string> <string>949AD36211E54AAA006D6BF4</string> <string>949AD4BD11E552D7006D6BF4</string> - <string>94EF6CFA11E55BAC003BA64D</string> - <string>94EF6CFB11E55BAC003BA64D</string> - <string>94EF6CFD11E55BAC003BA64D</string> - <string>94EF6CFF11E55BAC003BA64D</string> - <string>94EF6FD211E57601003BA64D</string> <string>94EF702B11E57954003BA64D</string> - <string>94EF709B11E57D20003BA64D</string> <string>94EE1DAA11E57FAB00DC6E8C</string> <string>94E1BDAB11E5A9F400D5B92B</string> <string>941A331D11E63E1A004796BA</string> <string>941A331F11E63E1A004796BA</string> - <string>941A333A11E640EE004796BA</string> - <string>941A33B411E64E46004796BA</string> - <string>94A3F91B11E6564F008113C6</string> - <string>9441DB6E11E6805300345F6C</string> <string>9441DB6F11E6805300345F6C</string> <string>9441DB7111E6805300345F6C</string> <string>9441DB7211E6805300345F6C</string> @@ -661,24 +676,16 @@ <string>9441DB7811E6805300345F6C</string> <string>9475A80511E695600010FB38</string> <string>9475A83511E6B5D50010FB38</string> - <string>94D124C311E6DCD000AAF81C</string> <string>94238E5E11E7B0EB004401BE</string> <string>94FAD00D11E7BDED009DD206</string> <string>94F1F15C11EB8AB5004B3AE3</string> - <string>940BCEBB11EC2D75007A3EE5</string> <string>9406B4DF11EC314E002670B7</string> <string>949F254511EC33FA00A34245</string> <string>949F254611EC33FA00A34245</string> <string>949F254811EC33FA00A34245</string> <string>94977E7C11EE46BC002BC5E9</string> - <string>9449ACA211EE4ECD00F667AC</string> - <string>9492B2F411F159F200EDB3D3</string> - <string>9492B3D511F166A100EDB3D3</string> <string>940377A3121DA39E00ECC885</string> - <string>940377F2121DB22400ECC885</string> <string>94FE71E81220876700417A56</string> - <string>94FE720B122089FC00417A56</string> - <string>94FE723E12208E9300417A56</string> <string>94FE724012208E9300417A56</string> <string>949813161220A5A200A71D33</string> <string>940E86871220A79D00AAB6F5</string> @@ -692,22 +699,20 @@ <string>942807EE1224862A0000DCFE</string> <string>942807EF1224862A0000DCFE</string> <string>942807F01224862A0000DCFE</string> - <string>942807F11224862A0000DCFE</string> <string>942808081224885E0000DCFE</string> - <string>944F6CFF1224D54300DFC0CD</string> - <string>944F6D4D1225017700DFC0CD</string> <string>94E8FA3C12258ED500EECD29</string> - <string>94E8FA5712258FA800EECD29</string> <string>94E8FA731225913000EECD29</string> <string>94E8FB6B1225BE3D00EECD29</string> <string>94E8FB6C1225BE3D00EECD29</string> <string>94FE45BC1225DC52005A3A8A</string> <string>941DE77F1227996A0027D899</string> - <string>941DE7801227996A0027D899</string> - <string>94A3EDC8122842CD00DF449D</string> - <string>94C83E751228B6D10021DA2B</string> <string>940C2A271228C6F20009E415</string> - <string>940C2A281228C6F20009E415</string> + <string>947E95C61228C9060065B3BA</string> + <string>940125A81228E3FC002883F0</string> + <string>940125DD1228E780002883F0</string> + <string>94803492122A23DF00C42504</string> + <string>94803493122A23DF00C42504</string> + <string>9494934311E5274B0019BC29</string> </array> </dict> <key>SplitCount</key> @@ -719,14 +724,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1181, 608}}</string> + <string>{{0, 0}, {1216, 519}}</string> <key>RubberWindowFrame</key> - <string>38 55 1646 973 0 0 1680 1028 </string> + <string>12 55 1646 973 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>608pt</string> + <string>519pt</string> </dict> <dict> <key>ContentConfiguration</key> @@ -739,18 +744,18 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 613}, {1181, 319}}</string> + <string>{{0, 524}, {1216, 408}}</string> <key>RubberWindowFrame</key> - <string>38 55 1646 973 0 0 1680 1028 </string> + <string>12 55 1646 973 0 0 1680 1028 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> - <string>319pt</string> + <string>408pt</string> </dict> </array> <key>Proportion</key> - <string>1181pt</string> + <string>1216pt</string> </dict> </array> <key>Name</key> @@ -765,9 +770,9 @@ </array> <key>TableOfContents</key> <array> - <string>940C29E01228C5890009E415</string> + <string>94803495122A23DF00C42504</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>940C29E11228C5890009E415</string> + <string>94803496122A23DF00C42504</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -888,7 +893,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>304662412.049927</real> + <real>304751583.20216298</real> <key>ToolbarDisplayMode</key> <integer>1</integer> <key>ToolbarIsVisible</key> @@ -903,16 +908,12 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>1C530D57069F1CE1000CFCEE</string> - <string>940C2A191228C6260009E415</string> - <string>940C2A1A1228C6260009E415</string> <string>9424FF6E0DDCB226009912BF</string> - <string>1CD10A99069EF8BA00B06720</string> - <string>1C78EAAD065D492600B07095</string> + <string>94803497122A23DF00C42504</string> <string>/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjcCOGVM.xcodeproj</string> </array> <key>WindowString</key> - <string>38 55 1646 973 0 0 1680 1028 </string> + <string>12 55 1646 973 0 0 1680 1028 </string> <key>WindowToolsV3</key> <array> <dict> @@ -933,7 +934,7 @@ <key>PBXProjectModuleGUID</key> <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> - <string>sqSqueakOSXScreenAndWindow.h</string> + <string></string> <key>StatusBarVisibility</key> <true/> </dict> @@ -950,8 +951,6 @@ <string>523pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -991,7 +990,7 @@ <key>TableOfContents</key> <array> <string>9424FF6E0DDCB226009912BF</string> - <string>940C29E21228C5890009E415</string> + <string>9480349B122A23DF00C42504</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> @@ -1111,13 +1110,13 @@ <key>TableOfContents</key> <array> <string>1CD10A99069EF8BA00B06720</string> - <string>940C29E31228C5890009E415</string> + <string>94AB32D81229A36C00F77B62</string> <string>1C162984064C10D400B95A72</string> - <string>940C29E41228C5890009E415</string> - <string>940C29E51228C5890009E415</string> - <string>940C29E61228C5890009E415</string> - <string>940C29E71228C5890009E415</string> - <string>940C29E81228C5890009E415</string> + <string>94AB32D91229A36C00F77B62</string> + <string>94AB32DA1229A36C00F77B62</string> + <string>94AB32DB1229A36C00F77B62</string> + <string>94AB32DC1229A36C00F77B62</string> + <string>94AB32DD1229A36C00F77B62</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debugV3</string> @@ -1151,7 +1150,7 @@ <key>PBXProjectModuleGUID</key> <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> - <string>sqSqueakOSXApplication.m</string> + <string>sqSqueakOSXNSView.m</string> <key>StatusBarVisibility</key> <true/> </dict> @@ -1207,8 +1206,8 @@ <key>TableOfContents</key> <array> <string>1C530D57069F1CE1000CFCEE</string> - <string>940C2A2A1228C6F20009E415</string> - <string>940C2A2B1228C6F20009E415</string> + <string>947E95BF1228C8F90065B3BA</string> + <string>947E95C01228C8F90065B3BA</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> @@ -1217,7 +1216,7 @@ <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> - <false/> + <true/> </dict> <dict> <key>Identifier</key> @@ -1236,8 +1235,6 @@ <key>Dock</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -1273,7 +1270,7 @@ <key>TableOfContents</key> <array> <string>1C78EAAD065D492600B07095</string> - <string>940C2A171228C6260009E415</string> + <string>94E580CE1228EC4E009F347B</string> <string>1C78EAAC065D492600B07095</string> </array> <key>ToolbarConfiguration</key> @@ -1283,7 +1280,7 @@ <key>WindowToolGUID</key> <string>1C78EAAD065D492600B07095</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser 2010-08-28 07:03:11 UTC (rev 2266) +++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser 2010-08-29 05:20:46 UTC (rev 2267) @@ -24,7 +24,7 @@ }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeArchitecturePreference = armv6; - activeBuildConfigurationName = Debug; + activeBuildConfigurationName = Distribution; activeExecutable = 947E62FD10AA098300D3B69E /* SqueakPureObjc */; activeSDKPreference = macosx10.5; activeTarget = 947E626F10AA098300D3B69E /* SqueakPureObjc */; @@ -128,7 +128,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 942, + 977, 20, 48, 43, @@ -202,7 +202,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 902, + 937, 60, 20, 48, @@ -219,289 +219,253 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 304661869; - PBXWorkspaceStateSaveDate = 304661869; + PBXPerProjectTemplateStateSaveDate = 304751352; + PBXWorkspaceStateSaveDate = 304751352; }; perUserProjectItems = { - 9402DDB610CE12A5005C2102 /* PBXTextBookmark */ = 9402DDB610CE12A5005C2102 /* PBXTextBookmark */; - 940377A3121DA39E00ECC885 /* PBXTextBookmark */ = 940377A3121DA39E00ECC885 /* PBXTextBookmark */; - 940377F2121DB22400ECC885 /* PBXTextBookmark */ = 940377F2121DB22400ECC885 /* PBXTextBookmark */; - 9406B4DF11EC314E002670B7 /* PBXTextBookmark */ = 9406B4DF11EC314E002670B7 /* PBXTextBookmark */; - 9406E7E210B663F4002F81F2 /* PBXTextBookmark */ = 9406E7E210B663F4002F81F2 /* PBXTextBookmark */; - 9406E87110B66A74002F81F2 /* PBXTextBookmark */ = 9406E87110B66A74002F81F2 /* PBXTextBookmark */; - 9406E8CC10B67499002F81F2 /* PBXTextBookmark */ = 9406E8CC10B67499002F81F2 /* PBXTextBookmark */; - 940BCEBB11EC2D75007A3EE5 /* PBXTextBookmark */ = 940BCEBB11EC2D75007A3EE5 /* PBXTextBookmark */; - 940C2A271228C6F20009E415 /* PlistBookmark */ = 940C2A271228C6F20009E415 /* PlistBookmark */; - 940C2A281228C6F20009E415 /* PBXTextBookmark */ = 940C2A281228C6F20009E415 /* PBXTextBookmark */; - 940C2A3F1228C78C0009E415 /* PBXTextBookmark */ = 940C2A3F1228C78C0009E415 /* PBXTextBookmark */; - 940E86871220A79D00AAB6F5 /* PBXTextBookmark */ = 940E86871220A79D00AAB6F5 /* PBXTextBookmark */; - 940E86A11220A8D200AAB6F5 /* PBXTextBookmark */ = 940E86A11220A8D200AAB6F5 /* PBXTextBookmark */; - 940E86A31220A8D200AAB6F5 /* PBXTextBookmark */ = 940E86A31220A8D200AAB6F5 /* PBXTextBookmark */; - 940E86EE1220AF3D00AAB6F5 /* PBXTextBookmark */ = 940E86EE1220AF3D00AAB6F5 /* PBXTextBookmark */; - 941441FD10BC817D0088F8AC /* PBXTextBookmark */ = 941441FD10BC817D0088F8AC /* PBXTextBookmark */; - 9414420110BC817D0088F8AC /* PBXTextBookmark */ = 9414420110BC817D0088F8AC /* PBXTextBookmark */; - 9414425110BC8A620088F8AC /* PBXBookmark */ = 9414425110BC8A620088F8AC /* PBXBookmark */; - 941991BA12245B21004EA3BA /* PBXTextBookmark */ = 941991BA12245B21004EA3BA /* PBXTextBookmark */; - 9419928512246E07004EA3BA /* PlistBookmark */ = 9419928512246E07004EA3BA /* PlistBookmark */; - 941A331D11E63E1A004796BA /* PBXTextBookmark */ = 941A331D11E63E1A004796BA /* PBXTextBookmark */; - 941A331F11E63E1A004796BA /* PBXTextBookmark */ = 941A331F11E63E1A004796BA /* PBXTextBookmark */; - 941A333A11E640EE004796BA /* PBXTextBookmark */ = 941A333A11E640EE004796BA /* PBXTextBookmark */; - 941A33B411E64E46004796BA /* PBXTextBookmark */ = 941A33B411E64E46004796BA /* PBXTextBookmark */; - 941DE77F1227996A0027D899 /* PBXTextBookmark */ = 941DE77F1227996A0027D899 /* PBXTextBookmark */; - 941DE7801227996A0027D899 /* PBXTextBookmark */ = 941DE7801227996A0027D899 /* PBXTextBookmark */; - 9421AB550FF1807D008F54E9 /* PBXTextBookmark */ = 9421AB550FF1807D008F54E9 /* PBXTextBookmark */; - 94238E5E11E7B0EB004401BE /* PBXTextBookmark */ = 94238E5E11E7B0EB004401BE /* PBXTextBookmark */; - 942807EE1224862A0000DCFE /* PBXTextBookmark */ = 942807EE1224862A0000DCFE /* PBXTextBookmark */; - 942807EF1224862A0000DCFE /* PBXTextBookmark */ = 942807EF1224862A0000DCFE /* PBXTextBookmark */; - 942807F01224862A0000DCFE /* PBXTextBookmark */ = 942807F01224862A0000DCFE /* PBXTextBookmark */; - 942807F11224862A0000DCFE /* PBXTextBookmark */ = 942807F11224862A0000DCFE /* PBXTextBookmark */; - 942808081224885E0000DCFE /* PBXTextBookmark */ = 942808081224885E0000DCFE /* PBXTextBookmark */; - 9428BBAD10BB50E200DAD287 /* PBXTextBookmark */ = 9428BBAD10BB50E200DAD287 /* PBXTextBookmark */; - 9428BC5510BB74BF00DAD287 /* PBXTextBookmark */ = 9428BC5510BB74BF00DAD287 /* PBXTextBookmark */; - 9428BC5710BB74BF00DAD287 /* PBXTextBookmark */ = 9428BC5710BB74BF00DAD287 /* PBXTextBookmark */; - 9428BF3810BBC2ED00DAD287 /* PBXTextBookmark */ = 9428BF3810BBC2ED00DAD287 /* PBXTextBookmark */; - 9428BF4F10BBCAAC00DAD287 /* PBXTextBookmark */ = 9428BF4F10BBCAAC00DAD287 /* PBXTextBookmark */; - 942ABEC510AA34820086D908 /* PBXTextBookmark */ = 942ABEC510AA34820086D908 /* PBXTextBookmark */; - 942B77330EA7E642004B266D /* PBXTextBookmark */ = 942B77330EA7E642004B266D /* PBXTextBookmark */; - 942B77380EA7E642004B266D /* PBXTextBookmark */ = 942B77380EA7E642004B266D /* PBXTextBookmark */; - 942B779B0EA7F2E0004B266D /* PBXTextBookmark */ = 942B779B0EA7F2E0004B266D /* PBXTextBookmark */; - 942B779C0EA7F2E0004B266D /* PBXTextBookmark */ = 942B779C0EA7F2E0004B266D /* PBXTextBookmark */; - 942B77B90EA800E1004B266D /* PBXTextBookmark */ = 942B77B90EA800E1004B266D /* PBXTextBookmark */; - 942B77BB0EA800E1004B266D /* PBXTextBookmark */ = 942B77BB0EA800E1004B266D /* PBXTextBookmark */; - 942B77C00EA800E1004B266D /* PBXTextBookmark */ = 942B77C00EA800E1004B266D /* PBXTextBookmark */; - 9430325510BD0B6D0045D33B /* PBXTextBookmark */ = 9430325510BD0B6D0045D33B /* PBXTextBookmark */; - 9430329A10BD103B0045D33B /* PBXTextBookmark */ = 9430329A10BD103B0045D33B /* PBXTextBookmark */; - 9430329B10BD103B0045D33B /* PBXTextBookmark */ = 9430329B10BD103B0045D33B /* PBXTextBookmark */; - 9441DB6E11E6805300345F6C /* PBXTextBookmark */ = 9441DB6E11E6805300345F6C /* PBXTextBookmark */; - 9441DB6F11E6805300345F6C /* PBXTextBookmark */ = 9441DB6F11E6805300345F6C /* PBXTextBookmark */; - 9441DB7111E6805300345F6C /* PBXTextBookmark */ = 9441DB7111E6805300345F6C /* PBXTextBookmark */; - 9441DB7211E6805300345F6C /* PBXTextBookmark */ = 9441DB7211E6805300345F6C /* PBXTextBookmark */; - 9441DB7311E6805300345F6C /* PBXTextBookmark */ = 9441DB7311E6805300345F6C /* PBXTextBookmark */; - 9441DB7511E6805300345F6C /* PBXTextBookmark */ = 9441DB7511E6805300345F6C /* PBXTextBookmark */; - 9441DB7811E6805300345F6C /* PBXTextBookmark */ = 9441DB7811E6805300345F6C /* PBXTextBookmark */; - 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */ = 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */; - 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */ = 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */; - 9449ACA211EE4ECD00F667AC /* PBXTextBookmark */ = 9449ACA211EE4ECD00F667AC /* PBXTextBookmark */; - 944F6CFF1224D54300DFC0CD /* PBXTextBookmark */ = 944F6CFF1224D54300DFC0CD /* PBXTextBookmark */; - 944F6D4D1225017700DFC0CD /* PBXTextBookmark */ = 944F6D4D1225017700DFC0CD /* PBXTextBookmark */; - 94547F160DE0AC7D00DD588F /* PBXTextBookmark */ = 94547F160DE0AC7D00DD588F /* PBXTextBookmark */; - 945481A60DE2A79200DD588F /* PBXTextBookmark */ = 945481A60DE2A79200DD588F /* PBXTextBookmark */; - 94554E670DF1171500FB176B /* PBXTextBookmark */ = 94554E670DF1171500FB176B /* PBXTextBookmark */; - 94554E690DF1171500FB176B /* PBXTextBookmark */ = 94554E690DF1171500FB176B /* PBXTextBookmark */; - 94554EB80DF1A86A00FB176B /* PBXTextBookmark */ = 94554EB80DF1A86A00FB176B /* PBXTextBookmark */; - 9456C24F10B2F268000BF3DE /* PBXTextBookmark */ = 9456C24F10B2F268000BF3DE /* PBXTextBookmark */; - 9456C25A10B2F2C9000BF3DE /* PBXTextBookmark */ = 9456C25A10B2F2C9000BF3DE /* PBXTextBookmark */; - 9456C32210B32F43000BF3DE /* PBXTextBookmark */ = 9456C32210B32F43000BF3DE /* PBXTextBookmark */; - 9456C34E10B33618000BF3DE /* PBXTextBookmark */ = 9456C34E10B33618000BF3DE /* PBXTextBookmark */; - 9456C3CB10B341F9000BF3DE /* PBXTextBookmark */ = 9456C3CB10B341F9000BF3DE /* PBXTextBookmark */; - 945C4D7C10BB0A8500548CC1 /* PBXTextBookmark */ = 945C4D7C10BB0A8500548CC1 /* PBXTextBookmark */; - 945C4EAC10BB348300548CC1 /* PBXTextBookmark */ = 945C4EAC10BB348300548CC1 /* PBXTextBookmark */; - 945E9D7C0DE525E100CDF01E /* PBXTextBookmark */ = 945E9D7C0DE525E100CDF01E /* PBXTextBookmark */; - 945F30FC0E0C763800CFF3DC /* PBXTextBookmark */ = 945F30FC0E0C763800CFF3DC /* PBXTextBookmark */; - 94638BD10EB0F98000A3F155 /* PBXTextBookmark */ = 94638BD10EB0F98000A3F155 /* PBXTextBookmark */; - 94638CEA0EB16F1100A3F155 /* PBXTextBookmark */ = 94638CEA0EB16F1100A3F155 /* PBXTextBookmark */; - 946D973B0FE165B70038846B /* PBXTextBookmark */ = 946D973B0FE165B70038846B /* PBXTextBookmark */; - 946DA76810C09A8C00F26F56 /* PBXTextBookmark */ = 946DA76810C09A8C00F26F56 /* PBXTextBookmark */; - 946DA7E010C0A7A400F26F56 /* PBXTextBookmark */ = 946DA7E010C0A7A400F26F56 /* PBXTextBookmark */; - 946DA8D910C0C32800F26F56 /* PBXTextBookmark */ = 946DA8D910C0C32800F26F56 /* PBXTextBookmark */; - 946DA8DA10C0C32800F26F56 /* PBXTextBookmark */ = 946DA8DA10C0C32800F26F56 /* PBXTextBookmark */; - 946DA8DB10C0C32800F26F56 /* PBXTextBookmark */ = 946DA8DB10C0C32800F26F56 /* PBXTextBookmark */; - 946DAA3810C0D8B700F26F56 /* PBXTextBookmark */ = 946DAA3810C0D8B700F26F56 /* PBXTextBookmark */; - 946DAA3A10C0D8B700F26F56 /* PBXTextBookmark */ = 946DAA3A10C0D8B700F26F56 /* PBXTextBookmark */; - 946DAA3C10C0D8B700F26F56 /* PBXTextBookmark */ = 946DAA3C10C0D8B700F26F56 /* PBXTextBookmark */; - 946DAB5110C0F2B000F26F56 /* PBXTextBookmark */ = 946DAB5110C0F2B000F26F56 /* PBXTextBookmark */; - 9471E48A0EB6C393000AE79D /* PBXTextBookmark */ = 9471E48A0EB6C393000AE79D /* PBXTextBookmark */; - 947332EE0EA70E8C003F9084 /* PBXTextBookmark */ = 947332EE0EA70E8C003F9084 /* PBXTextBookmark */; - 9473A34810BBD84100ED7D00 /* PBXTextBookmark */ = 9473A34810BBD84100ED7D00 /* PBXTextBookmark */; - 9473A95A1102F70B00D135CB /* PBXTextBookmark */ = 9473A95A1102F70B00D135CB /* PBXTextBookmark */; - 9473A9701103BE0A00D135CB /* PBXTextBookmark */ = 9473A9701103BE0A00D135CB /* PBXTextBookmark */; - 9475A80511E695600010FB38 /* PlistBookmark */ = 9475A80511E695600010FB38 /* PlistBookmark */; - 9475A83511E6B5D50010FB38 /* PBXTextBookmark */ = 9475A83511E6B5D50010FB38 /* PBXTextBookmark */; - 9475F4DB10BEF4100047A24B /* PBXTextBookmark */ = 9475F4DB10BEF4100047A24B /* PBXTextBookmark */; - 9475F56B10BF20A00047A24B /* PBXTextBookmark */ = 9475F56B10BF20A00047A24B /* PBXTextBookmark */; - 9475F5A710BF25A10047A24B /* PBXTextBookmark */ = 9475F5A710BF25A10047A24B /* PBXTextBookmark */; - 947713D410C45E5F00890A9B /* PBXTextBookmark */ = 947713D410C45E5F00890A9B /* PBXTextBookmark */; - 9478E13D0EC8EB46007096A7 /* PBXTextBookmark */ = 9478E13D0EC8EB46007096A7 /* PBXTextBookmark */; - 947923F21102BC12007C87F8 /* PBXTextBookmark */ = 947923F21102BC12007C87F8 /* PBXTextBookmark */; - 947923FE1102BE53007C87F8 /* PBXTextBookmark */ = 947923FE1102BE53007C87F8 /* PBXTextBookmark */; - 947924171102E275007C87F8 /* PBXTextBookmark */ = 947924171102E275007C87F8 /* PBXTextBookmark */; - 947E210C0EB28486007957D0 /* PBXTextBookmark */ = 947E210C0EB28486007957D0 /* PBXTextBookmark */; - 947E61D610AA049300D3B69E /* PBXTextBookmark */ = 947E61D610AA049300D3B69E /* PBXTextBookmark */; - 947E61DA10AA049300D3B69E /* PBXTextBookmark */ = 947E61DA10AA049300D3B69E /* PBXTextBookmark */; - 947E61DC10AA049300D3B69E /* PBXTextBookmark */ = 947E61DC10AA049300D3B69E /* PBXTextBookmark */; - 947E644910AA0F2C00D3B69E /* PBXTextBookmark */ = 947E644910AA0F2C00D3B69E /* PBXTextBookmark */; - 947E644B10AA0F2C00D3B69E /* PBXTextBookmark */ = 947E644B10AA0F2C00D3B69E /* PBXTextBookmark */; - 947E644E10AA0F2C00D3B69E /* PBXTextBookmark */ = 947E644E10AA0F2C00D3B69E /* PBXTextBookmark */; - 947E645010AA0F2C00D3B69E /* PBXTextBookmark */ = 947E645010AA0F2C00D3B69E /* PBXTextBookmark */; - 94838AAA1220CC9100FFD92B /* PlistBookmark */ = 94838AAA1220CC9100FFD92B /* PlistBookmark */; - 9484F86210B0DCC60038BDC0 /* PBXTextBookmark */ = 9484F86210B0DCC60038BDC0 /* PBXTextBookmark */; - 9484F86510B0DCC60038BDC0 /* PBXTextBookmark */ = 9484F86510B0DCC60038BDC0 /* PBXTextBookmark */; - 9484F8FC10B0E1770038BDC0 /* PBXBookmark */ = 9484F8FC10B0E1770038BDC0 /* PBXBookmark */; - 9484F9CE10B13E1C0038BDC0 /* PBXTextBookmark */ = 9484F9CE10B13E1C0038BDC0 /* PBXTextBookmark */; - 94862F8310BA182500CAA2EB /* PBXTextBookmark */ = 94862F8310BA182500CAA2EB /* PBXTextBookmark */; - 94862F9E10BA1A0100CAA2EB /* PBXTextBookmark */ = 94862F9E10BA1A0100CAA2EB /* PBXTextBookmark */; - 9486302A10BA247200CAA2EB /* PBXTextBookmark */ = 9486302A10BA247200CAA2EB /* PBXTextBookmark */; - 948704AE0E12CABF00D565C3 /* PBXTextBookmark */ = 948704AE0E12CABF00D565C3 /* PBXTextBookmark */; - 948704B20E12CABF00D565C3 /* PBXTextBookmark */ = 948704B20E12CABF00D565C3 /* PBXTextBookmark */; - 9487071F0E132B1000D565C3 /* PBXTextBookmark */ = 9487071F0E132B1000D565C3 /* PBXTextBookmark */; - 9487755C10C64FF100E4AEC5 /* PBXTextBookmark */ = 9487755C10C64FF100E4AEC5 /* PBXTextBookmark */; - 9487755D10C64FF100E4AEC5 /* PBXTextBookmark */ = 9487755D10C64FF100E4AEC5 /* PBXTextBookmark */; - 9487756010C64FF100E4AEC5 /* PBXTextBookmark */ = 9487756010C64FF100E4AEC5 /* PBXTextBookmark */; - 948C0820112DE98D0017EE7F /* PBXTextBookmark */ = 948C0820112DE98D0017EE7F /* PBXTextBookmark */; - 948FAA0310BF855500BE88CF /* PBXTextBookmark */ = 948FAA0310BF855500BE88CF /* PBXTextBookmark */; - 948FAB5B10BFAD3C00BE88CF /* PBXTextBookmark */ = 948FAB5B10BFAD3C00BE88CF /* PBXTextBookmark */; - 949198B010BC8DFC00C629D1 /* PBXTextBookmark */ = 949198B010BC8DFC00C629D1 /* PBXTextBookmark */; - 949198C910BC8FBB00C629D1 /* PBXTextBookmark */ = 949198C910BC8FBB00C629D1 /* PBXTextBookmark */; - 9492450510BA42EF00E726F5 /* PBXTextBookmark */ = 9492450510BA42EF00E726F5 /* PBXTextBookmark */; - 9492450710BA42EF00E726F5 /* PBXTextBookmark */ = 9492450710BA42EF00E726F5 /* PBXTextBookmark */; - 9492450910BA42EF00E726F5 /* PBXTextBookmark */ = 9492450910BA42EF00E726F5 /* PBXTextBookmark */; - 949245B210BA4A6200E726F5 /* PBXTextBookmark */ = 949245B210BA4A6200E726F5 /* PBXTextBookmark */; - 9492B2F411F159F200EDB3D3 /* PBXTextBookmark */ = 9492B2F411F159F200EDB3D3 /* PBXTextBookmark */; - 9492B3D511F166A100EDB3D3 /* PBXTextBookmark */ = 9492B3D511F166A100EDB3D3 /* PBXTextBookmark */; - 9493E98F10EE90BC000C4FB3 /* PBXTextBookmark */ = 9493E98F10EE90BC000C4FB3 /* PBXTextBookmark */; - 9494933A11E5274B0019BC29 /* PBXTextBookmark */ = 9494933A11E5274B0019BC29 /* PBXTextBookmark */; - 9494934011E5274B0019BC29 /* PBXTextBookmark */ = 9494934011E5274B0019BC29 /* PBXTextBookmark */; - 9494934211E5274B0019BC29 /* PBXTextBookmark */ = 9494934211E5274B0019BC29 /* PBXTextBookmark */; - 9494934311E5274B0019BC29 /* PBXTextBookmark */ = 9494934311E5274B0019BC29 /* PBXTextBookmark */; - 9494944B11E52D570019BC29 /* PBXTextBookmark */ = 9494944B11E52D570019BC29 /* PBXTextBookmark */; - 94977E7C11EE46BC002BC5E9 /* PBXTextBookmark */ = 94977E7C11EE46BC002BC5E9 /* PBXTextBookmark */; - 949813161220A5A200A71D33 /* PBXTextBookmark */ = 949813161220A5A200A71D33 /* PBXTextBookmark */; - 949AD35211E54A81006D6BF4 /* PBXTextBookmark */ = 949AD35211E54A81006D6BF4 /* PBXTextBookmark */; - 949AD36211E54AAA006D6BF4 /* PBXTextBookmark */ = 949AD36211E54AAA006D6BF4 /* PBXTextBookmark */; - 949AD4BD11E552D7006D6BF4 /* PBXTextBookmark */ = 949AD4BD11E552D7006D6BF4 /* PBXTextBookmark */; - 949DDD6D11D141080017F79B /* PBXTextBookmark */ = 949DDD6D11D141080017F79B /* PBXTextBookmark */; - 949F254511EC33FA00A34245 /* PBXTextBookmark */ = 949F254511EC33FA00A34245 /* PBXTextBookmark */; - 949F254611EC33FA00A34245 /* PBXTextBookmark */ = 949F254611EC33FA00A34245 /* PBXTextBookmark */; - 949F254811EC33FA00A34245 /* PBXTextBookmark */ = 949F254811EC33FA00A34245 /* PBXTextBookmark */; - 94A1B2AA10B9E92A00C64473 /* PBXTextBookmark */ = 94A1B2AA10B9E92A00C64473 /* PBXTextBookmark */; - 94A1B41E10BA05E600C64473 /* PBXTextBookmark */ = 94A1B41E10BA05E600C64473 /* PBXTextBookmark */; - 94A3EDC8122842CD00DF449D /* PBXTextBookmark */ = 94A3EDC8122842CD00DF449D /* PBXTextBookmark */; - 94A3F91B11E6564F008113C6 /* PBXTextBookmark */ = 94A3F91B11E6564F008113C6 /* PBXTextBookmark */; - 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */; - 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */; - 94AF3A1F12231A7200691409 /* PBXTextBookmark */ = 94AF3A1F12231A7200691409 /* PBXTextBookmark */; - 94B1514E0DE2CE530059F208 /* PBXTextBookmark */ = 94B1514E0DE2CE530059F208 /* PBXTextBookmark */; - 94B7898910C4F95E005EA70D /* PBXTextBookmark */ = 94B7898910C4F95E005EA70D /* PBXTextBookmark */; - 94B88C530E81500200C98131 /* PBXTextBookmark */ = 94B88C530E81500200C98131 /* PBXTextBookmark */; - 94B88C560E81500200C98131 /* PBXTextBookmark */ = 94B88C560E81500200C98131 /* PBXTextBookmark */; - 94B954A010E6D0F700DC476A /* PBXTextBookmark */ = 94B954A010E6D0F700DC476A /* PBXTextBookmark */; - 94BCAD4A10AB981B00F87527 /* PBXTextBookmark */ = 94BCAD4A10AB981B00F87527 /* PBXTextBookmark */; - 94BCAE9010ACA3A300F87527 /* PBXTextBookmark */ = 94BCAE9010ACA3A300F87527 /* PBXTextBookmark */; - 94BCAFC710ACC89100F87527 /* PBXTextBookmark */ = 94BCAFC710ACC89100F87527 /* PBXTextBookmark */; - 94BCE7390DDDEF8200F38F31 /* PBXTextBookmark */ = 94BCE7390DDDEF8200F38F31 /* PBXTextBookmark */; - 94C2074310AF5FB7002F4160 /* PBXTextBookmark */ = 94C2074310AF5FB7002F4160 /* PBXTextBookmark */; - 94C2091210AF7413002F4160 /* PBXTextBookmark */ = 94C2091210AF7413002F4160 /* PBXTextBookmark */; - 94C2092A10AF769A002F4160 /* PBXTextBookmark */ = 94C2092A10AF769A002F4160 /* PBXTextBookmark */; - 94C2092D10AF769A002F4160 /* PBXTextBookmark */ = 94C2092D10AF769A002F4160 /* PBXTextBookmark */; - 94C367C010AF9C0A0041953A /* PBXTextBookmark */ = 94C367C010AF9C0A0041953A /* PBXTextBookmark */; - 94C367C210AF9C0A0041953A /* PBXTextBookmark */ = 94C367C210AF9C0A0041953A /* PBXTextBookmark */; - 94C367D110AF9C830041953A /* PBXTextBookmark */ = 94C367D110AF9C830041953A /* PBXTextBookmark */; - 94C3696410AFB7550041953A /* PBXTextBookmark */ = 94C3696410AFB7550041953A /* PBXTextBookmark */; - 94C3698D10B082DF0041953A /* PBXTextBookmark */ = 94C3698D10B082DF0041953A /* PBXTextBookmark */; - 94C3699110B082DF0041953A /* PBXTextBookmark */ = 94C3699110B082DF0041953A /* PBXTextBookmark */; - 94C83E751228B6D10021DA2B /* PBXTextBookmark */ = 94C83E751228B6D10021DA2B /* PBXTextBookmark */; - 94C887D410ADCC0D007CB39E /* PBXTextBookmark */ = 94C887D410ADCC0D007CB39E /* PBXTextBookmark */; - 94C888B710ADE75B007CB39E /* PBXTextBookmark */ = 94C888B710ADE75B007CB39E /* PBXTextBookmark */; - 94C88B6810AF26F8007CB39E /* PBXTextBookmark */ = 94C88B6810AF26F8007CB39E /* PBXTextBookmark */; - 94CA691410B1CAD8007F207C /* PBXTextBookmark */ = 94CA691410B1CAD8007F207C /* PBXTextBookmark */; - 94CFE4AF10BE3CA600847DF5 /* PBXTextBookmark */ = 94CFE4AF10BE3CA600847DF5 /* PBXTextBookmark */; - 94CFE6A910BE63A900847DF5 /* PBXTextBookmark */ = 94CFE6A910BE63A900847DF5 /* PBXTextBookmark */; - 94CFE6B810BE63A900847DF5 /* PBXTextBookmark */ = 94CFE6B810BE63A900847DF5 /* PBXTextBookmark */; - 94CFE6B910BE63A900847DF5 /* PBXTextBookmark */ = 94CFE6B910BE63A900847DF5 /* PBXTextBookmark */; - 94CFE6C010BE63A900847DF5 /* PBXTextBookmark */ = 94CFE6C010BE63A900847DF5 /* PBXTextBookmark */; - 94CFE70110BE683800847DF5 /* PBXTextBookmark */ = 94CFE70110BE683800847DF5 /* PBXTextBookmark */; - 94D124C311E6DCD000AAF81C /* PBXTextBookmark */ = 94D124C311E6DCD000AAF81C /* PBXTextBookmark */; - 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */ = 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */; - 94D16BFE10BCEFEE00A69A89 /* PBXTextBookmark */ = 94D16BFE10BCEFEE00A69A89 /* PBXTextBookmark */; - 94D16C2A10BCF28A00A69A89 /* PBXTextBookmark */ = 94D16C2A10BCF28A00A69A89 /* PBXTextBookmark */; - 94D16C4010BCF3E100A69A89 /* PBXTextBookmark */ = 94D16C4010BCF3E100A69A89 /* PBXTextBookmark */; - 94D16CA310BCF93000A69A89 /* PBXTextBookmark */ = 94D16CA310BCF93000A69A89 /* PBXTextBookmark */; - 94D3660B10CEE03900805023 /* PBXTextBookmark */ = 94D3660B10CEE03900805023 /* PBXTextBookmark */; - 94D715CB10B723B200F69A71 /* PBXTextBookmark */ = 94D715CB10B723B200F69A71 /* PBXTextBookmark */; - 94D7174110B72FDF00F69A71 /* PBXTextBookmark */ = 94D7174110B72FDF00F69A71 /* PBXTextBookmark */; - 94D7177D10B73A3800F69A71 /* PBXTextBookmark */ = 94D7177D10B73A3800F69A71 /* PBXTextBookmark */; - 94D7178410B73A3800F69A71 /* PBXTextBookmark */ = 94D7178410B73A3800F69A71 /* PBXTextBookmark */; - 94D7178610B73A3800F69A71 /* PBXTextBookmark */ = 94D7178610B73A3800F69A71 /* PBXTextBookmark */; - 94D7178810B73A3800F69A71 /* PBXTextBookmark */ = 94D7178810B73A3800F69A71 /* PBXTextBookmark */; - 94D7178A10B73A3800F69A71 /* PBXTextBookmark */ = 94D7178A10B73A3800F69A71 /* PBXTextBookmark */; - 94D7178C10B73A3800F69A71 /* PBXTextBookmark */ = 94D7178C10B73A3800F69A71 /* PBXTextBookmark */; - 94D7179110B73A3800F69A71 /* PBXTextBookmark */ = 94D7179110B73A3800F69A71 /* PBXTextBookmark */; - 94D717BE10B73DD900F69A71 /* PBXTextBookmark */ = 94D717BE10B73DD900F69A71 /* PBXTextBookmark */; - 94D717F810B743B800F69A71 /* PBXTextBookmark */ = 94D717F810B743B800F69A71 /* PBXTextBookmark */; - 94D7183810B74BF300F69A71 /* PBXTextBookmark */ = 94D7183810B74BF300F69A71 /* PBXTextBookmark */; - 94D7183A10B74BF300F69A71 /* PBXTextBookmark */ = 94D7183A10B74BF300F69A71 /* PBXTextBookmark */; - 94D73E5210B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E5210B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E5410B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E5410B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E5610B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E5610B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E5810B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E5810B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E5A10B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E5A10B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E5C10B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E5C10B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E5E10B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E5E10B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E6010B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E6010B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E6210B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E6210B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E6410B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E6410B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E6810B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E6810B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73E6A10B5B9CE00F8C034 /* PBXTextBookmark */ = 94D73E6A10B5B9CE00F8C034 /* PBXTextBookmark */; - 94D73EE610B5CF8400F8C034 /* PBXTextBookmark */ = 94D73EE610B5CF8400F8C034 /* PBXTextBookmark */; - 94D73F4910B5DA4E00F8C034 /* PBXTextBookmark */ = 94D73F4910B5DA4E00F8C034 /* PBXTextBookmark */; - 94D73FA010B5E5A200F8C034 /* PBXTextBookmark */ = 94D73FA010B5E5A200F8C034 /* PBXTextBookmark */; - 94D73FAD10B5E69900F8C034 /* PBXTextBookmark */ = 94D73FAD10B5E69900F8C034 /* PBXTextBookmark */; - 94D73FB510B5E6DA00F8C034 /* PBXTextBookmark */ = 94D73FB510B5E6DA00F8C034 /* PBXTextBookmark */; - 94D7401510B5F8AF00F8C034 /* PBXTextBookmark */ = 94D7401510B5F8AF00F8C034 /* PBXTextBookmark */; - 94D7403810B5FDDB00F8C034 /* PBXTextBookmark */ = 94D7403810B5FDDB00F8C034 /* PBXTextBookmark */; - 94D7403A10B5FDDB00F8C034 /* PBXTextBookmark */ = 94D7403A10B5FDDB00F8C034 /* PBXTextBookmark */; - 94D7403C10B5FDDB00F8C034 /* PBXTextBookmark */ = 94D7403C10B5FDDB00F8C034 /* PBXTextBookmark */; - 94D740B210B6242000F8C034 /* PBXTextBookmark */ = 94D740B210B6242000F8C034 /* PBXTextBookmark */; - 94E1BDAB11E5A9F400D5B92B /* PBXTextBookmark */ = 94E1BDAB11E5A9F400D5B92B /* PBXTextBookmark */; - 94E297D10DECA72F009CF73A /* PBXTextBookmark */ = 94E297D10DECA72F009CF73A /* PBXTextBookmark */; - 94E297D30DECA72F009CF73A /* PBXTextBookmark */ = 94E297D30DECA72F009CF73A /* PBXTextBookmark */; - 94E297D50DECA72F009CF73A /* PBXTextBookmark */ = 94E297D50DECA72F009CF73A /* PBXTextBookmark */; - 94E297D70DECA72F009CF73A /* PBXTextBookmark */ = 94E297D70DECA72F009CF73A /* PBXTextBookmark */; - 94E2DAD40ED2351B00012E92 /* PBXTextBookmark */ = 94E2DAD40ED2351B00012E92 /* PBXTextBookmark */; - 94E2DB270ED2355F00012E92 /* PBXTextBookmark */ = 94E2DB270ED2355F00012E92 /* PBXTextBookmark */; - 94E4930310BD32D00011AC75 /* PBXTextBookmark */ = 94E4930310BD32D00011AC75 /* PBXTextBookmark */; - 94E583DB10BF43970073FD63 /* PBXTextBookmark */ = 94E583DB10BF43970073FD63 /* PBXTextBookmark */; - 94E584AE10BF6EE30073FD63 /* PBXTextBookmark */ = 94E584AE10BF6EE30073FD63 /* PBXTextBookmark */; - 94E584FF10BF79AB0073FD63 /* PBXTextBookmark */ = 94E584FF10BF79AB0073FD63 /* PBXTextBookmark */; - 94E5850010BF79AB0073FD63 /* PBXTextBookmark */ = 94E5850010BF79AB0073FD63 /* PBXTextBookmark */; - 94E8EEEA11C94D5D0049D853 /* PBXTextBookmark */ = 94E8EEEA11C94D5D0049D853 /* PBXTextBookmark */; - 94E8FA3C12258ED500EECD29 /* PBXTextBookmark */ = 94E8FA3C12258ED500EECD29 /* PBXTextBookmark */; - 94E8FA5712258FA800EECD29 /* PBXTextBookmark */ = 94E8FA5712258FA800EECD29 /* PBXTextBookmark */; - 94E8FA731225913000EECD29 /* PBXTextBookmark */ = 94E8FA731225913000EECD29 /* PBXTextBookmark */; - 94E8FB6B1225BE3D00EECD29 /* PBXTextBookmark */ = 94E8FB6B1225BE3D00EECD29 /* PBXTextBookmark */; - 94E8FB6C1225BE3D00EECD29 /* PBXTextBookmark */ = 94E8FB6C1225BE3D00EECD29 /* PBXTextBookmark */; - 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */ = 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */; - 94EE1DAA11E57FAB00DC6E8C /* PBXTextBookmark */ = 94EE1DAA11E57FAB00DC6E8C /* PBXTextBookmark */; - 94EF6CFA11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFA11E55BAC003BA64D /* PBXTextBookmark */; - 94EF6CFB11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFB11E55BAC003BA64D /* PBXTextBookmark */; - 94EF6CFD11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFD11E55BAC003BA64D /* PBXTextBookmark */; - 94EF6CFF11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFF11E55BAC003BA64D /* PBXTextBookmark */; - 94EF6FD211E57601003BA64D /* PBXTextBookmark */ = 94EF6FD211E57601003BA64D /* PBXTextBookmark */; - 94EF702B11E57954003BA64D /* PBXTextBookmark */ = 94EF702B11E57954003BA64D /* PBXTextBookmark */; - 94EF709B11E57D20003BA64D /* PBXTextBookmark */ = 94EF709B11E57D20003BA64D /* PBXTextBookmark */; - 94F155570E83EA1F001657CE /* PBXTextBookmark */ = 94F155570E83EA1F001657CE /* PBXTextBookmark */; - 94F155580E83EA1F001657CE /* PBXTextBookmark */ = 94F155580E83EA1F001657CE /* PBXTextBookmark */; - 94F1F15C11EB8AB5004B3AE3 /* PBXTextBookmark */ = 94F1F15C11EB8AB5004B3AE3 /* PBXTextBookmark */; - 94F1F5C910C30C22008DB9CF /* PBXTextBookmark */ = 94F1F5C910C30C22008DB9CF /* PBXTextBookmark */; - 94F5C1870DF26EF200099B11 /* PBXTextBookmark */ = 94F5C1870DF26EF200099B11 /* PBXTextBookmark */; - 94F5C25F0DF42C7600099B11 /* PBXTextBookmark */ = 94F5C25F0DF42C7600099B11 /* PBXTextBookmark */; - 94F5C2600DF42C7600099B11 /* PBXTextBookmark */ = 94F5C2600DF42C7600099B11 /* PBXTextBookmark */; - 94F5F29110BC518B00847EEE /* PBXTextBookmark */ = 94F5F29110BC518B00847EEE /* PBXTextBookmark */; - 94F5F29210BC518B00847EEE /* PBXTextBookmark */ = 94F5F29210BC518B00847EEE /* PBXTextBookmark */; - 94F5F29410BC518B00847EEE /* PBXTextBookmark */ = 94F5F29410BC518B00847EEE /* PBXTextBookmark */; - 94F5F29510BC518B00847EEE /* PBXTextBookmark */ = 94F5F29510BC518B00847EEE /* PBXTextBookmark */; - 94F5F2A810BC539700847EEE /* PBXTextBookmark */ = 94F5F2A810BC539700847EEE /* PBXTextBookmark */; - 94F89AFE10B4997900556475 /* PBXTextBookmark */ = 94F89AFE10B4997900556475 /* PBXTextBookmark */; - 94F89BDE10B4B77400556475 /* PBXTextBookmark */ = 94F89BDE10B4B77400556475 /* PBXTextBookmark */; - 94F89BE010B4B77400556475 /* PBXTextBookmark */ = 94F89BE010B4B77400556475 /* PBXTextBookmark */; - 94F89C9110B4C0B800556475 /* PBXTextBookmark */ = 94F89C9110B4C0B800556475 /* PBXTextBookmark */; - 94F8E42E0DE6129D003F4F53 /* PBXTextBookmark */ = 94F8E42E0DE6129D003F4F53 /* PBXTextBookmark */; - 94FAD00D11E7BDED009DD206 /* PBXTextBookmark */ = 94FAD00D11E7BDED009DD206 /* PBXTextBookmark */; - 94FE45BC1225DC52005A3A8A /* PBXTextBookmark */ = 94FE45BC1225DC52005A3A8A /* PBXTextBookmark */; - 94FE71E81220876700417A56 /* PBXTextBookmark */ = 94FE71E81220876700417A56 /* PBXTextBookmark */; - 94FE720B122089FC00417A56 /* PBXTextBookmark */ = 94FE720B122089FC00417A56 /* PBXTextBookmark */; - 94FE723E12208E9300417A56 /* PBXTextBookmark */ = 94FE723E12208E9300417A56 /* PBXTextBookmark */; - 94FE724012208E9300417A56 /* PlistBookmark */ = 94FE724012208E9300417A56 /* PlistBookmark */; + 940125A81228E3FC002883F0 = 940125A81228E3FC002883F0 /* PBXTextBookmark */; + 940125DD1228E780002883F0 = 940125DD1228E780002883F0 /* PBXTextBookmark */; + 9402DDB610CE12A5005C2102 = 9402DDB610CE12A5005C2102 /* PBXTextBookmark */; + 940377A3121DA39E00ECC885 = 940377A3121DA39E00ECC885 /* PBXTextBookmark */; + 9406B4DF11EC314E002670B7 = 9406B4DF11EC314E002670B7 /* PBXTextBookmark */; + 9406E7E210B663F4002F81F2 = 9406E7E210B663F4002F81F2 /* PBXTextBookmark */; + 9406E87110B66A74002F81F2 = 9406E87110B66A74002F81F2 /* PBXTextBookmark */; + 9406E8CC10B67499002F81F2 = 9406E8CC10B67499002F81F2 /* PBXTextBookmark */; + 940C2A271228C6F20009E415 = 940C2A271228C6F20009E415 /* PlistBookmark */; + 940E86871220A79D00AAB6F5 = 940E86871220A79D00AAB6F5 /* PBXTextBookmark */; + 940E86A11220A8D200AAB6F5 = 940E86A11220A8D200AAB6F5 /* PBXTextBookmark */; + 940E86A31220A8D200AAB6F5 = 940E86A31220A8D200AAB6F5 /* PBXTextBookmark */; + 940E86EE1220AF3D00AAB6F5 = 940E86EE1220AF3D00AAB6F5 /* PBXTextBookmark */; + 941441FD10BC817D0088F8AC = 941441FD10BC817D0088F8AC /* PBXTextBookmark */; + 9414420110BC817D0088F8AC = 9414420110BC817D0088F8AC /* PBXTextBookmark */; + 9414425110BC8A620088F8AC = 9414425110BC8A620088F8AC /* PBXBookmark */; + 941991BA12245B21004EA3BA = 941991BA12245B21004EA3BA /* PBXTextBookmark */; + 9419928512246E07004EA3BA = 9419928512246E07004EA3BA /* PlistBookmark */; + 941A331D11E63E1A004796BA = 941A331D11E63E1A004796BA /* PBXTextBookmark */; + 941A331F11E63E1A004796BA = 941A331F11E63E1A004796BA /* PBXTextBookmark */; + 941DE77F1227996A0027D899 = 941DE77F1227996A0027D899 /* PBXTextBookmark */; + 9421AB550FF1807D008F54E9 = 9421AB550FF1807D008F54E9 /* PBXTextBookmark */; + 94238E5E11E7B0EB004401BE = 94238E5E11E7B0EB004401BE /* PBXTextBookmark */; + 942807EE1224862A0000DCFE = 942807EE1224862A0000DCFE /* PBXTextBookmark */; + 942807EF1224862A0000DCFE = 942807EF1224862A0000DCFE /* PBXTextBookmark */; + 942807F01224862A0000DCFE = 942807F01224862A0000DCFE /* PBXTextBookmark */; + 942808081224885E0000DCFE = 942808081224885E0000DCFE /* PBXTextBookmark */; + 9428BBAD10BB50E200DAD287 = 9428BBAD10BB50E200DAD287 /* PBXTextBookmark */; + 9428BC5510BB74BF00DAD287 = 9428BC5510BB74BF00DAD287 /* PBXTextBookmark */; + 9428BC5710BB74BF00DAD287 = 9428BC5710BB74BF00DAD287 /* PBXTextBookmark */; + 9428BF3810BBC2ED00DAD287 = 9428BF3810BBC2ED00DAD287 /* PBXTextBookmark */; + 9428BF4F10BBCAAC00DAD287 = 9428BF4F10BBCAAC00DAD287 /* PBXTextBookmark */; + 942ABEC510AA34820086D908 = 942ABEC510AA34820086D908 /* PBXTextBookmark */; + 942B77330EA7E642004B266D = 942B77330EA7E642004B266D /* PBXTextBookmark */; + 942B77380EA7E642004B266D = 942B77380EA7E642004B266D /* PBXTextBookmark */; + 942B779B0EA7F2E0004B266D = 942B779B0EA7F2E0004B266D /* PBXTextBookmark */; + 942B779C0EA7F2E0004B266D = 942B779C0EA7F2E0004B266D /* PBXTextBookmark */; + 942B77B90EA800E1004B266D = 942B77B90EA800E1004B266D /* PBXTextBookmark */; + 942B77BB0EA800E1004B266D = 942B77BB0EA800E1004B266D /* PBXTextBookmark */; + 942B77C00EA800E1004B266D = 942B77C00EA800E1004B266D /* PBXTextBookmark */; + 942BF1B4122A21E8008D29C7 = 942BF1B4122A21E8008D29C7 /* PBXTextBookmark */; + 9430325510BD0B6D0045D33B = 9430325510BD0B6D0045D33B /* PBXTextBookmark */; + 9430329A10BD103B0045D33B = 9430329A10BD103B0045D33B /* PBXTextBookmark */; + 9430329B10BD103B0045D33B = 9430329B10BD103B0045D33B /* PBXTextBookmark */; + 9441DB6F11E6805300345F6C = 9441DB6F11E6805300345F6C /* PBXTextBookmark */; + 9441DB7111E6805300345F6C = 9441DB7111E6805300345F6C /* PBXTextBookmark */; + 9441DB7211E6805300345F6C = 9441DB7211E6805300345F6C /* PBXTextBookmark */; + 9441DB7311E6805300345F6C = 9441DB7311E6805300345F6C /* PBXTextBookmark */; + 9441DB7511E6805300345F6C = 9441DB7511E6805300345F6C /* PBXTextBookmark */; + 9441DB7811E6805300345F6C = 9441DB7811E6805300345F6C /* PBXTextBookmark */; + 9448940B10F3E8FF00FB3EC8 = 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */; + 94547F160DE0AC7D00DD588F = 94547F160DE0AC7D00DD588F /* PBXTextBookmark */; + 945481A60DE2A79200DD588F = 945481A60DE2A79200DD588F /* PBXTextBookmark */; + 94554E670DF1171500FB176B = 94554E670DF1171500FB176B /* PBXTextBookmark */; + 94554E690DF1171500FB176B = 94554E690DF1171500FB176B /* PBXTextBookmark */; + 94554EB80DF1A86A00FB176B = 94554EB80DF1A86A00FB176B /* PBXTextBookmark */; + 9456C24F10B2F268000BF3DE = 9456C24F10B2F268000BF3DE /* PBXTextBookmark */; + 9456C25A10B2F2C9000BF3DE = 9456C25A10B2F2C9000BF3DE /* PBXTextBookmark */; + 9456C32210B32F43000BF3DE = 9456C32210B32F43000BF3DE /* PBXTextBookmark */; + 9456C34E10B33618000BF3DE = 9456C34E10B33618000BF3DE /* PBXTextBookmark */; + 9456C3CB10B341F9000BF3DE = 9456C3CB10B341F9000BF3DE /* PBXTextBookmark */; + 945C4D7C10BB0A8500548CC1 = 945C4D7C10BB0A8500548CC1 /* PBXTextBookmark */; + 945C4EAC10BB348300548CC1 = 945C4EAC10BB348300548CC1 /* PBXTextBookmark */; + 945E9D7C0DE525E100CDF01E = 945E9D7C0DE525E100CDF01E /* PBXTextBookmark */; + 945F30FC0E0C763800CFF3DC = 945F30FC0E0C763800CFF3DC /* PBXTextBookmark */; + 94638BD10EB0F98000A3F155 = 94638BD10EB0F98000A3F155 /* PBXTextBookmark */; + 94638CEA0EB16F1100A3F155 = 94638CEA0EB16F1100A3F155 /* PBXTextBookmark */; + 946D973B0FE165B70038846B = 946D973B0FE165B70038846B /* PBXTextBookmark */; + 946DA76810C09A8C00F26F56 = 946DA76810C09A8C00F26F56 /* PBXTextBookmark */; + 946DA7E010C0A7A400F26F56 = 946DA7E010C0A7A400F26F56 /* PBXTextBookmark */; + 946DA8D910C0C32800F26F56 = 946DA8D910C0C32800F26F56 /* PBXTextBookmark */; + 946DA8DA10C0C32800F26F56 = 946DA8DA10C0C32800F26F56 /* PBXTextBookmark */; + 946DA8DB10C0C32800F26F56 = 946DA8DB10C0C32800F26F56 /* PBXTextBookmark */; + 946DAA3810C0D8B700F26F56 = 946DAA3810C0D8B700F26F56 /* PBXTextBookmark */; + 946DAA3A10C0D8B700F26F56 = 946DAA3A10C0D8B700F26F56 /* PBXTextBookmark */; + 946DAA3C10C0D8B700F26F56 = 946DAA3C10C0D8B700F26F56 /* PBXTextBookmark */; + 947332EE0EA70E8C003F9084 = 947332EE0EA70E8C003F9084 /* PBXTextBookmark */; + 9473A34810BBD84100ED7D00 = 9473A34810BBD84100ED7D00 /* PBXTextBookmark */; + 9473A95A1102F70B00D135CB = 9473A95A1102F70B00D135CB /* PBXTextBookmark */; + 9473A9701103BE0A00D135CB = 9473A9701103BE0A00D135CB /* PBXTextBookmark */; + 9475A80511E695600010FB38 = 9475A80511E695600010FB38 /* PlistBookmark */; + 9475A83511E6B5D50010FB38 = 9475A83511E6B5D50010FB38 /* PBXTextBookmark */; + 9475F4DB10BEF4100047A24B = 9475F4DB10BEF4100047A24B /* PBXTextBookmark */; + 9475F56B10BF20A00047A24B = 9475F56B10BF20A00047A24B /* PBXTextBookmark */; + 9475F5A710BF25A10047A24B = 9475F5A710BF25A10047A24B /* PBXTextBookmark */; + 947713D410C45E5F00890A9B = 947713D410C45E5F00890A9B /* PBXTextBookmark */; + 9478E13D0EC8EB46007096A7 = 9478E13D0EC8EB46007096A7 /* PBXTextBookmark */; + 947923F21102BC12007C87F8 = 947923F21102BC12007C87F8 /* PBXTextBookmark */; + 947923FE1102BE53007C87F8 = 947923FE1102BE53007C87F8 /* PBXTextBookmark */; + 947E210C0EB28486007957D0 = 947E210C0EB28486007957D0 /* PBXTextBookmark */; + 947E61D610AA049300D3B69E = 947E61D610AA049300D3B69E /* PBXTextBookmark */; + 947E61DA10AA049300D3B69E = 947E61DA10AA049300D3B69E /* PBXTextBookmark */; + 947E61DC10AA049300D3B69E = 947E61DC10AA049300D3B69E /* PBXTextBookmark */; + 947E95C61228C9060065B3BA = 947E95C61228C9060065B3BA /* PBXTextBookmark */; + 94803492122A23DF00C42504 /* PBXTextBookmark */ = 94803492122A23DF00C42504 /* PBXTextBookmark */; + 94803493122A23DF00C42504 /* PBXTextBookmark */ = 94803493122A23DF00C42504 /* PBXTextBookmark */; + 94803494122A23DF00C42504 /* PBXTextBookmark */ = 94803494122A23DF00C42504 /* PBXTextBookmark */; + 94803499122A23DF00C42504 /* PBXTextBookmark */ = 94803499122A23DF00C42504 /* PBXTextBookmark */; + 9480349A122A23DF00C42504 /* PBXTextBookmark */ = 9480349A122A23DF00C42504 /* PBXTextBookmark */; + 94838AAA1220CC9100FFD92B = 94838AAA1220CC9100FFD92B /* PlistBookmark */; + 9484F86210B0DCC60038BDC0 = 9484F86210B0DCC60038BDC0 /* PBXTextBookmark */; + 9484F86510B0DCC60038BDC0 = 9484F86510B0DCC60038BDC0 /* PBXTextBookmark */; + 9484F8FC10B0E1770038BDC0 = 9484F8FC10B0E1770038BDC0 /* PBXBookmark */; + 94862F8310BA182500CAA2EB = 94862F8310BA182500CAA2EB /* PBXTextBookmark */; + 94862F9E10BA1A0100CAA2EB = 94862F9E10BA1A0100CAA2EB /* PBXTextBookmark */; + 9486302A10BA247200CAA2EB = 9486302A10BA247200CAA2EB /* PBXTextBookmark */; + 948704AE0E12CABF00D565C3 = 948704AE0E12CABF00D565C3 /* PBXTextBookmark */; + 9487071F0E132B1000D565C3 = 9487071F0E132B1000D565C3 /* PBXTextBookmark */; + 948C0820112DE98D0017EE7F = 948C0820112DE98D0017EE7F /* PBXTextBookmark */; + 948FAA0310BF855500BE88CF = 948FAA0310BF855500BE88CF /* PBXTextBookmark */; + 948FAB5B10BFAD3C00BE88CF = 948FAB5B10BFAD3C00BE88CF /* PBXTextBookmark */; + 949198B010BC8DFC00C629D1 = 949198B010BC8DFC00C629D1 /* PBXTextBookmark */; + 949198C910BC8FBB00C629D1 = 949198C910BC8FBB00C629D1 /* PBXTextBookmark */; + 9492450510BA42EF00E726F5 = 9492450510BA42EF00E726F5 /* PBXTextBookmark */; + 9492450710BA42EF00E726F5 = 9492450710BA42EF00E726F5 /* PBXTextBookmark */; + 9492450910BA42EF00E726F5 = 9492450910BA42EF00E726F5 /* PBXTextBookmark */; + 949245B210BA4A6200E726F5 = 949245B210BA4A6200E726F5 /* PBXTextBookmark */; + 9493E98F10EE90BC000C4FB3 = 9493E98F10EE90BC000C4FB3 /* PBXTextBookmark */; + 9494934011E5274B0019BC29 = 9494934011E5274B0019BC29 /* PBXTextBookmark */; + 9494934211E5274B0019BC29 = 9494934211E5274B0019BC29 /* PBXTextBookmark */; + 9494934311E5274B0019BC29 = 9494934311E5274B0019BC29 /* PBXTextBookmark */; + 9494944B11E52D570019BC29 = 9494944B11E52D570019BC29 /* PBXTextBookmark */; + 94977E7C11EE46BC002BC5E9 = 94977E7C11EE46BC002BC5E9 /* PBXTextBookmark */; + 949813161220A5A200A71D33 = 949813161220A5A200A71D33 /* PBXTextBookmark */; + 949AD35211E54A81006D6BF4 = 949AD35211E54A81006D6BF4 /* PBXTextBookmark */; + 949AD36211E54AAA006D6BF4 = 949AD36211E54AAA006D6BF4 /* PBXTextBookmark */; + 949AD4BD11E552D7006D6BF4 = 949AD4BD11E552D7006D6BF4 /* PBXTextBookmark */; + 949DDD6D11D141080017F79B = 949DDD6D11D141080017F79B /* PBXTextBookmark */; + 949F254511EC33FA00A34245 = 949F254511EC33FA00A34245 /* PBXTextBookmark */; + 949F254611EC33FA00A34245 = 949F254611EC33FA00A34245 /* PBXTextBookmark */; + 949F254811EC33FA00A34245 = 949F254811EC33FA00A34245 /* PBXTextBookmark */; + 94A1B2AA10B9E92A00C64473 = 94A1B2AA10B9E92A00C64473 /* PBXTextBookmark */; + 94A1B41E10BA05E600C64473 = 94A1B41E10BA05E600C64473 /* PBXTextBookmark */; + 94AB2E6A0E003879006A79E4 = 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */; + 94AB2E6C0E003879006A79E4 = 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */; + 94AB33341229A67B00F77B62 = 94AB33341229A67B00F77B62 /* PBXTextBookmark */; + 94AF3A1F12231A7200691409 = 94AF3A1F12231A7200691409 /* PBXTextBookmark */; + 94B1514E0DE2CE530059F208 = 94B1514E0DE2CE530059F208 /* PBXTextBookmark */; + 94B7898910C4F95E005EA70D = 94B7898910C4F95E005EA70D /* PBXTextBookmark */; + 94B88C530E81500200C98131 = 94B88C530E81500200C98131 /* PBXTextBookmark */; + 94B88C560E81500200C98131 = 94B88C560E81500200C98131 /* PBXTextBookmark */; + 94BCAD4A10AB981B00F87527 = 94BCAD4A10AB981B00F87527 /* PBXTextBookmark */; + 94BCAE9010ACA3A300F87527 = 94BCAE9010ACA3A300F87527 /* PBXTextBookmark */; + 94BCAFC710ACC89100F87527 = 94BCAFC710ACC89100F87527 /* PBXTextBookmark */; + 94C2074310AF5FB7002F4160 = 94C2074310AF5FB7002F4160 /* PBXTextBookmark */; + 94C2091210AF7413002F4160 = 94C2091210AF7413002F4160 /* PBXTextBookmark */; + 94C2092A10AF769A002F4160 = 94C2092A10AF769A002F4160 /* PBXTextBookmark */; + 94C2092D10AF769A002F4160 = 94C2092D10AF769A002F4160 /* PBXTextBookmark */; + 94C367C010AF9C0A0041953A = 94C367C010AF9C0A0041953A /* PBXTextBookmark */; + 94C367C210AF9C0A0041953A = 94C367C210AF9C0A0041953A /* PBXTextBookmark */; + 94C367D110AF9C830041953A = 94C367D110AF9C830041953A /* PBXTextBookmark */; + 94C3696410AFB7550041953A = 94C3696410AFB7550041953A /* PBXTextBookmark */; + 94C3698D10B082DF0041953A = 94C3698D10B082DF0041953A /* PBXTextBookmark */; + 94C3699110B082DF0041953A = 94C3699110B082DF0041953A /* PBXTextBookmark */; + 94C887D410ADCC0D007CB39E = 94C887D410ADCC0D007CB39E /* PBXTextBookmark */; + 94C888B710ADE75B007CB39E = 94C888B710ADE75B007CB39E /* PBXTextBookmark */; + 94C88B6810AF26F8007CB39E = 94C88B6810AF26F8007CB39E /* PBXTextBookmark */; + 94CFE6A910BE63A900847DF5 = 94CFE6A910BE63A900847DF5 /* PBXTextBookmark */; + 94CFE6B810BE63A900847DF5 = 94CFE6B810BE63A900847DF5 /* PBXTextBookmark */; + 94CFE6B910BE63A900847DF5 = 94CFE6B910BE63A900847DF5 /* PBXTextBookmark */; + 94CFE6C010BE63A900847DF5 = 94CFE6C010BE63A900847DF5 /* PBXTextBookmark */; + 94CFE70110BE683800847DF5 = 94CFE70110BE683800847DF5 /* PBXTextBookmark */; + 94D16BFC10BCEFEE00A69A89 = 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */; + 94D16BFE10BCEFEE00A69A89 = 94D16BFE10BCEFEE00A69A89 /* PBXTextBookmark */; + 94D16C2A10BCF28A00A69A89 = 94D16C2A10BCF28A00A69A89 /* PBXTextBookmark */; + 94D16C4010BCF3E100A69A89 = 94D16C4010BCF3E100A69A89 /* PBXTextBookmark */; + 94D16CA310BCF93000A69A89 = 94D16CA310BCF93000A69A89 /* PBXTextBookmark */; + 94D3660B10CEE03900805023 = 94D3660B10CEE03900805023 /* PBXTextBookmark */; + 94D715CB10B723B200F69A71 = 94D715CB10B723B200F69A71 /* PBXTextBookmark */; + 94D7174110B72FDF00F69A71 = 94D7174110B72FDF00F69A71 /* PBXTextBookmark */; + 94D7177D10B73A3800F69A71 = 94D7177D10B73A3800F69A71 /* PBXTextBookmark */; + 94D7178410B73A3800F69A71 = 94D7178410B73A3800F69A71 /* PBXTextBookmark */; + 94D7178610B73A3800F69A71 = 94D7178610B73A3800F69A71 /* PBXTextBookmark */; + 94D7178810B73A3800F69A71 = 94D7178810B73A3800F69A71 /* PBXTextBookmark */; + 94D7178A10B73A3800F69A71 = 94D7178A10B73A3800F69A71 /* PBXTextBookmark */; + 94D7178C10B73A3800F69A71 = 94D7178C10B73A3800F69A71 /* PBXTextBookmark */; + 94D7179110B73A3800F69A71 = 94D7179110B73A3800F69A71 /* PBXTextBookmark */; + 94D717BE10B73DD900F69A71 = 94D717BE10B73DD900F69A71 /* PBXTextBookmark */; + 94D717F810B743B800F69A71 = 94D717F810B743B800F69A71 /* PBXTextBookmark */; + 94D7183810B74BF300F69A71 = 94D7183810B74BF300F69A71 /* PBXTextBookmark */; + 94D7183A10B74BF300F69A71 = 94D7183A10B74BF300F69A71 /* PBXTextBookmark */; + 94D73E5210B5B9CE00F8C034 = 94D73E5210B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E5410B5B9CE00F8C034 = 94D73E5410B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E5610B5B9CE00F8C034 = 94D73E5610B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E5810B5B9CE00F8C034 = 94D73E5810B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E5A10B5B9CE00F8C034 = 94D73E5A10B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E5C10B5B9CE00F8C034 = 94D73E5C10B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E5E10B5B9CE00F8C034 = 94D73E5E10B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E6010B5B9CE00F8C034 = 94D73E6010B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E6210B5B9CE00F8C034 = 94D73E6210B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E6410B5B9CE00F8C034 = 94D73E6410B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E6810B5B9CE00F8C034 = 94D73E6810B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73E6A10B5B9CE00F8C034 = 94D73E6A10B5B9CE00F8C034 /* PBXTextBookmark */; + 94D73EE610B5CF8400F8C034 = 94D73EE610B5CF8400F8C034 /* PBXTextBookmark */; + 94D73F4910B5DA4E00F8C034 = 94D73F4910B5DA4E00F8C034 /* PBXTextBookmark */; + 94D73FA010B5E5A200F8C034 = 94D73FA010B5E5A200F8C034 /* PBXTextBookmark */; + 94D73FAD10B5E69900F8C034 = 94D73FAD10B5E69900F8C034 /* PBXTextBookmark */; + 94D73FB510B5E6DA00F8C034 = 94D73FB510B5E6DA00F8C034 /* PBXTextBookmark */; + 94D7401510B5F8AF00F8C034 = 94D7401510B5F8AF00F8C034 /* PBXTextBookmark */; + 94D7403810B5FDDB00F8C034 = 94D7403810B5FDDB00F8C034 /* PBXTextBookmark */; + 94D7403A10B5FDDB00F8C034 = 94D7403A10B5FDDB00F8C034 /* PBXTextBookmark */; + 94D740B210B6242000F8C034 = 94D740B210B6242000F8C034 /* PBXTextBookmark */; + 94E1BDAB11E5A9F400D5B92B = 94E1BDAB11E5A9F400D5B92B /* PBXTextBookmark */; + 94E297D10DECA72F009CF73A = 94E297D10DECA72F009CF73A /* PBXTextBookmark */; + 94E297D30DECA72F009CF73A = 94E297D30DECA72F009CF73A /* PBXTextBookmark */; + 94E297D50DECA72F009CF73A = 94E297D50DECA72F009CF73A /* PBXTextBookmark */; + 94E297D70DECA72F009CF73A = 94E297D70DECA72F009CF73A /* PBXTextBookmark */; + 94E2DAD40ED2351B00012E92 = 94E2DAD40ED2351B00012E92 /* PBXTextBookmark */; + 94E2DB270ED2355F00012E92 = 94E2DB270ED2355F00012E92 /* PBXTextBookmark */; + 94E4930310BD32D00011AC75 = 94E4930310BD32D00011AC75 /* PBXTextBookmark */; + 94E583DB10BF43970073FD63 = 94E583DB10BF43970073FD63 /* PBXTextBookmark */; + 94E584AE10BF6EE30073FD63 = 94E584AE10BF6EE30073FD63 /* PBXTextBookmark */; + 94E584FF10BF79AB0073FD63 = 94E584FF10BF79AB0073FD63 /* PBXTextBookmark */; + 94E5850010BF79AB0073FD63 = 94E5850010BF79AB0073FD63 /* PBXTextBookmark */; + 94E8EEEA11C94D5D0049D853 = 94E8EEEA11C94D5D0049D853 /* PBXTextBookmark */; + 94E8FA3C12258ED500EECD29 = 94E8FA3C12258ED500EECD29 /* PBXTextBookmark */; + 94E8FA731225913000EECD29 = 94E8FA731225913000EECD29 /* PBXTextBookmark */; + 94E8FB6B1225BE3D00EECD29 = 94E8FB6B1225BE3D00EECD29 /* PBXTextBookmark */; + 94E8FB6C1225BE3D00EECD29 = 94E8FB6C1225BE3D00EECD29 /* PBXTextBookmark */; + 94ED7EFA0E6C2ABE00F4DD03 = 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */; + 94EE1DAA11E57FAB00DC6E8C = 94EE1DAA11E57FAB00DC6E8C /* PBXTextBookmark */; + 94EF702B11E57954003BA64D = 94EF702B11E57954003BA64D /* PBXTextBookmark */; + 94F155570E83EA1F001657CE = 94F155570E83EA1F001657CE /* PBXTextBookmark */; + 94F155580E83EA1F001657CE = 94F155580E83EA1F001657CE /* PBXTextBookmark */; + 94F1F15C11EB8AB5004B3AE3 = 94F1F15C11EB8AB5004B3AE3 /* PBXTextBookmark */; + 94F1F5C910C30C22008DB9CF = 94F1F5C910C30C22008DB9CF /* PBXTextBookmark */; + 94F5C1870DF26EF200099B11 = 94F5C1870DF26EF200099B11 /* PBXTextBookmark */; + 94F5C25F0DF42C7600099B11 = 94F5C25F0DF42C7600099B11 /* PBXTextBookmark */; + 94F5C2600DF42C7600099B11 = 94F5C2600DF42C7600099B11 /* PBXTextBookmark */; + 94F5F29110BC518B00847EEE = 94F5F29110BC518B00847EEE /* PBXTextBookmark */; + 94F5F29210BC518B00847EEE = 94F5F29210BC518B00847EEE /* PBXTextBookmark */; + 94F5F29410BC518B00847EEE = 94F5F29410BC518B00847EEE /* PBXTextBookmark */; + 94F5F29510BC518B00847EEE = 94F5F29510BC518B00847EEE /* PBXTextBookmark */; + 94F5F2A810BC539700847EEE = 94F5F2A810BC539700847EEE /* PBXTextBookmark */; + 94F89AFE10B4997900556475 = 94F89AFE10B4997900556475 /* PBXTextBookmark */; + 94F89BDE10B4B77400556475 = 94F89BDE10B4B77400556475 /* PBXTextBookmark */; + 94F89BE010B4B77400556475 = 94F89BE010B4B77400556475 /* PBXTextBookmark */; + 94F89C9110B4C0B800556475 = 94F89C9110B4C0B800556475 /* PBXTextBookmark */; + 94F8E42E0DE6129D003F4F53 = 94F8E42E0DE6129D003F4F53 /* PBXTextBookmark */; + 94FAD00D11E7BDED009DD206 = 94FAD00D11E7BDED009DD206 /* PBXTextBookmark */; + 94FE45BC1225DC52005A3A8A = 94FE45BC1225DC52005A3A8A /* PBXTextBookmark */; + 94FE71E81220876700417A56 = 94FE71E81220876700417A56 /* PBXTextBookmark */; + 94FE724012208E9300417A56 = 94FE724012208E9300417A56 /* PlistBookmark */; }; sourceControlManager = 9424FF420DDC8673009912BF /* Source Control */; userBookmarkGroup = 94B8F4B910CF5BFF00F0DD6B /* PBXBookmarkGroup */; @@ -532,6 +496,26 @@ sepNavWindowFrame = "{{483, -9}, {694, 1008}}"; }; }; + 940125A81228E3FC002883F0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94845C211228E29F00BEB880 /* macvideo.cpp */; + name = "macvideo.cpp: 883"; + rLen = 30; + rLoc = 41143; + rType = 0; + vrLen = 3284; + vrLoc = 40081; + }; + 940125DD1228E780002883F0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 941724420F36624C0031AF33 /* squeakProxy.m */; + name = "squeakProxy.m: 48"; + rLen = 1264; + rLoc = 1914; + rType = 0; + vrLen = 980; + vrLoc = 1915; + }; 9402DD5E10CE0C16005C2102 /* SqViewBitmapConversion.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {2070, 1053}}"; @@ -612,16 +596,6 @@ vrLen = 1158; vrLoc = 6939; }; - 940377F2121DB22400ECC885 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658E10DDD03FE00358328 /* interp.h */; - name = "interp.h: 7"; - rLen = 0; - rLoc = 176; - rType = 0; - vrLen = 685; - vrLoc = 0; - }; 9406B4DF11EC314E002670B7 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9406B4E011EC314E002670B7 /* mach_time.h */; @@ -704,16 +678,6 @@ path = /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSRange.h; sourceTree = "<absolute>"; }; - 940BCEBB11EC2D75007A3EE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9424FF5D0DDCB1C7009912BF /* sq.h */; - name = "sq.h: 132"; - rLen = 0; - rLoc = 5638; - rType = 0; - vrLen = 2243; - vrLoc = 4977; - }; 940C2A271228C6F20009E415 /* PlistBookmark */ = { isa = PlistBookmark; fRef = 949AD14911E542E8006D6BF4 /* SqueakPureObjc-InfoCOG.plist */; @@ -724,28 +688,8 @@ ); name = "/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist"; rLen = 0; - rLoc = 9223372036854775807; + rLoc = 9223372036854775808; }; - 940C2A281228C6F20009E415 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */; - name = "sqSqueakOSXApplication.m: 249"; - rLen = 0; - rLoc = 7860; - rType = 0; - vrLen = 1349; - vrLoc = 7040; - }; - 940C2A3F1228C78C0009E415 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */; - name = "sqSqueakOSXApplication.m: 249"; - rLen = 0; - rLoc = 7873; - rType = 0; - vrLen = 1351; - vrLoc = 7017; - }; 940CE8540DFCE2D200EBA91B /* SqueakUIController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {905, 790}}"; @@ -864,9 +808,9 @@ }; 941724420F36624C0031AF33 /* squeakProxy.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 2457}}"; - sepNavSelRange = "{3440, 13}"; - sepNavVisRange = "{2667, 1229}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 2496}}"; + sepNavSelRange = "{1914, 1264}"; + sepNavVisRange = "{1915, 980}"; sepNavWindowFrame = "{{15, 49}, {1346, 974}}"; }; }; @@ -932,26 +876,6 @@ path = "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_devel_glib2-devel/work/glib-2.15.6/glib/gatomic.c"; sourceTree = "<absolute>"; }; - 941A333A11E640EE004796BA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494935011E527AB0019BC29 /* sqMemoryFence.h */; - name = "sqMemoryFence.h: 53"; - rLen = 16; - rLoc = 2247; - rType = 0; - vrLen = 2383; - vrLoc = 0; - }; - 941A33B411E64E46004796BA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E659000DDD03FE00358328 /* JPEGReadWriter2Plugin.c */; - name = "JPEGReadWriter2Plugin.c: 696"; - rLen = 29; - rLoc = 20297; - rType = 0; - vrLen = 2099; - vrLoc = 19525; - }; 941D1C9A0E696FC7005B77B3 /* Entitlements.plist */ = { uiCtxt = { sepNavWindowFrame = "{{15, 166}, {1288, 857}}"; @@ -967,16 +891,6 @@ vrLen = 1313; vrLoc = 86; }; - 941DE7801227996A0027D899 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */; - name = "sqSqueakOSXNSView.h: 34"; - rLen = 0; - rLoc = 1683; - rType = 0; - vrLen = 1981; - vrLoc = 777; - }; 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1132, 27534}}"; @@ -1322,16 +1236,6 @@ vrLen = 1345; vrLoc = 0; }; - 942807F11224862A0000DCFE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 949493BF11E52ADE0019BC29 /* aio.c */; - name = "aio.c: 211"; - rLen = 7; - rLoc = 5142; - rType = 0; - vrLen = 1294; - vrLoc = 4481; - }; 942808081224885E0000DCFE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9452D5D90E044A9D000AD792 /* sqMacV2Time.c */; @@ -1580,6 +1484,16 @@ vrLen = 1337; vrLoc = 687512; }; + 942BF1B4122A21E8008D29C7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */; + name = "sqSqueakOSXNSView.h: 34"; + rLen = 0; + rLoc = 1683; + rType = 0; + vrLen = 1646; + vrLoc = 777; + }; 942CF43710BFCD52008F9BB7 /* sqGnu.h */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1729,16 +1643,6 @@ sepNavVisRange = "{0, 902}"; }; }; - 9441DB6E11E6805300345F6C /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 949492C411E51C6B0019BC29 /* sqAtomicOps.h */; - name = "sqAtomicOps.h: 143"; - rLen = 19; - rLoc = 5280; - rType = 0; - vrLen = 2230; - vrLoc = 4371; - }; 9441DB6F11E6805300345F6C /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9452D5DE0E044A9D000AD792 /* sqSqueakFileDirectoryInterface.m */; @@ -1799,16 +1703,6 @@ vrLen = 2666; vrLoc = 947; }; - 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E659140DDD03FE00358328 /* SoundGenerationPlugin.c */; - name = "SoundGenerationPlugin.c: 176"; - rLen = 0; - rLoc = 5124; - rType = 0; - vrLen = 999; - vrLoc = 4556; - }; 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 943198450DDF4D9800EB8E60 /* sqUnixQuartz.m */; @@ -1826,26 +1720,6 @@ sepNavVisRange = "{1829264, 2214}"; }; }; - 9449ACA211EE4ECD00F667AC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E659A40DDD053900358328 /* sqSoundCodecPluginBasicPrims.c */; - name = "sqSoundCodecPluginBasicPrims.c: 370"; - rLen = 6; - rLoc = 10030; - rType = 0; - vrLen = 1361; - vrLoc = 9384; - }; - 944F6CFF1224D54300DFC0CD /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */; - name = "sqUnixHeartbeat.c: 291"; - rLen = 0; - rLoc = 8683; - rType = 0; - vrLen = 1184; - vrLoc = 7955; - }; 944F6D171224D7B300DFC0CD /* sqSqueakOSXApplication+imageReadWrite.m:64 */ = { isa = PBXFileBreakpoint; actions = ( @@ -1860,20 +1734,10 @@ ignoreCount = 0; lineNumber = 64; location = Squeak; - modificationTime = 304662255.905671; + modificationTime = 304671821.493346; originalNumberOfMultipleMatches = 1; state = 1; }; - 944F6D4D1225017700DFC0CD /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94BCE6870DDDECB800F38F31 /* HostWindowPlugin.h */; - name = "HostWindowPlugin.h: 20"; - rLen = 21; - rLoc = 970; - rType = 0; - vrLen = 2546; - vrLoc = 0; - }; 9452BDC10F4095DE006410DE /* sqSqueakIPhoneApplication+Network.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1036, 652}}"; @@ -2277,7 +2141,7 @@ ignoreCount = 0; lineNumber = 101; location = Squeak; - modificationTime = 304662255.678706; + modificationTime = 304671821.321019; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2310,7 +2174,7 @@ ignoreCount = 0; lineNumber = 37; location = Squeak; - modificationTime = 304662255.72459; + modificationTime = 304671821.344695; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2327,7 +2191,7 @@ ignoreCount = 0; lineNumber = 45; location = Squeak; - modificationTime = 304662255.748367; + modificationTime = 304671821.370002; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2344,7 +2208,7 @@ ignoreCount = 0; lineNumber = 50; location = Squeak; - modificationTime = 304662255.793859; + modificationTime = 304671821.394016; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2361,7 +2225,7 @@ ignoreCount = 0; lineNumber = 72; location = Squeak; - modificationTime = 304662255.815886; + modificationTime = 304671821.417298; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2378,7 +2242,7 @@ ignoreCount = 0; lineNumber = 88; location = Squeak; - modificationTime = 304662255.865148; + modificationTime = 304671821.444096; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2422,9 +2286,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 31; - modificationTime = 304662349.994016; + modificationTime = 304671820.597508; originalNumberOfMultipleMatches = 1; - state = 1; + state = 0; }; 9458528110F045FC001401E7 /* sqSqueakIPhoneClipboardAPI.m:24 */ = { isa = PBXFileBreakpoint; @@ -2438,9 +2302,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 24; - modificationTime = 304662349.99407; + modificationTime = 304671820.597536; originalNumberOfMultipleMatches = 1; - state = 1; + state = 0; }; 9458528310F045FD001401E7 /* sqSqueakIPhoneClipboardAPI.m:17 */ = { isa = PBXFileBreakpoint; @@ -2454,9 +2318,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 17; - modificationTime = 304662349.99405; + modificationTime = 304671820.597549; originalNumberOfMultipleMatches = 1; - state = 1; + state = 0; }; 945BA53B10B218F700C2020C /* math.h */ = { isa = PBXFileReference; @@ -2793,16 +2657,6 @@ path = "/Users/johnmci/Documents/SqueakHydraZBaseCheck/HydraVM-src/platforms/unix/vm/sqUnixExternalPrims.c"; sourceTree = "<absolute>"; }; - 946DAB5110C0F2B000F26F56 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 946DA8D210C0C30D00F26F56 /* DropPlugin.c */; - name = "DropPlugin.c: 178"; - rLen = 18; - rLoc = 4453; - rType = 0; - vrLen = 1691; - vrLoc = 3335; - }; 9471D2710E04703B00703D45 /* sqSqueakScreenAndWindow.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1368, 923}}"; @@ -2834,16 +2688,6 @@ sepNavVisRange = "{1540, 1093}"; }; }; - 9471E48A0EB6C393000AE79D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E6591A0DDD03FE00358328 /* StarSqueakPlugin.c */; - name = "StarSqueakPlugin.c: 95"; - rLen = 2; - rLoc = 2480; - rType = 0; - vrLen = 1031; - vrLoc = 2015; - }; 947332EE0EA70E8C003F9084 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 947332EF0EA70E8C003F9084 /* sqWin32Stubs.c */; @@ -3077,16 +2921,6 @@ path = /Volumes/px2/business/SqueakiPhone/archivesOLDSTUFF/platformsOLDDrawing/unix/vm/sqUnixMain.c; sourceTree = "<absolute>"; }; - 947924171102E275007C87F8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658E60DDD03FE00358328 /* B2DPlugin.c */; - name = "B2DPlugin.c: 6117"; - rLen = 12; - rLoc = 189972; - rType = 0; - vrLen = 1391; - vrLoc = 189145; - }; 947E20F50EB281C5007957D0 /* SqueakFFIPrims.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1132, 37440}}"; @@ -3344,46 +3178,6 @@ sepNavVisRange = "{492, 1556}"; }; }; - 947E644910AA0F2C00D3B69E /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658EC0DDD03FE00358328 /* BMPReadWriterPlugin.c */; - name = "BMPReadWriterPlugin.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1250; - vrLoc = 0; - }; - 947E644B10AA0F2C00D3B69E /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658F20DDD03FE00358328 /* FFTPlugin.c */; - name = "FFTPlugin.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1243; - vrLoc = 0; - }; - 947E644E10AA0F2C00D3B69E /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658F80DDD03FE00358328 /* GeniePlugin.c */; - name = "GeniePlugin.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1285; - vrLoc = 0; - }; - 947E645010AA0F2C00D3B69E /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658FE0DDD03FE00358328 /* JPEGReaderPlugin.c */; - name = "JPEGReaderPlugin.c: 115"; - rLen = 0; - rLoc = 3465; - rType = 0; - vrLen = 1395; - vrLoc = 2800; - }; 947E647910AA100900D3B69E /* SqueakOSXAppDelegate.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1283, 767}}"; @@ -3410,12 +3204,69 @@ }; 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 3679}}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 3666}}"; sepNavSelRange = "{7873, 0}"; sepNavVisRange = "{7017, 1351}"; sepNavWindowFrame = "{{522, 48}, {1017, 978}}"; }; }; + 947E95C61228C9060065B3BA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */; + name = "sqSqueakOSXApplication.m: 249"; + rLen = 0; + rLoc = 7873; + rType = 0; + vrLen = 1351; + vrLoc = 7017; + }; + 94803492122A23DF00C42504 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */; + name = "sqSqueakOSXNSView.h: 34"; + rLen = 0; + rLoc = 1683; + rType = 0; + vrLen = 1665; + vrLoc = 713; + }; + 94803493122A23DF00C42504 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C88BDD10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.h */; + name = "sqSqueakOSXScreenAndWindow.h: 45"; + rLen = 23; + rLoc = 1951; + rType = 0; + vrLen = 1758; + vrLoc = 279; + }; + 94803494122A23DF00C42504 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C88BDE10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.m */; + name = "sqSqueakOSXScreenAndWindow.m: 64"; + rLen = 17; + rLoc = 2405; + rType = 0; + vrLen = 873; + vrLoc = 1799; + }; + 94803499122A23DF00C42504 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; + rLen = 0; + rLoc = 9223372036854775807; + rType = 0; + }; + 9480349A122A23DF00C42504 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; + name = "sqSqueakOSXNSView.m: 186"; + rLen = 4; + rLoc = 6536; + rType = 0; + vrLen = 2524; + vrLoc = 4218; + }; 94838AAA1220CC9100FFD92B /* PlistBookmark */ = { isa = PlistBookmark; fRef = 948774B110C64DD800E4AEC5 /* SqueakPureObjc-Info 64*64.plist */; @@ -3427,6 +3278,13 @@ rLen = 0; rLoc = 9223372036854775808; }; + 94845C211228E29F00BEB880 /* macvideo.cpp */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.cpp; + name = macvideo.cpp; + path = /opt/intel/Compiler/11.1/076/Frameworks/tbb/examples/common/gui/macvideo.cpp; + sourceTree = "<absolute>"; + }; 9484F7B910B0D3600038BDC0 /* SystemConfiguration.h */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3465,16 +3323,6 @@ isa = PBXBookmark; fRef = 945550910DF2041100FB176B /* Default.png */; }; - 9484F9CE10B13E1C0038BDC0 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658F00DDD03FE00358328 /* DSAPrims.c */; - name = "DSAPrims.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 846; - vrLoc = 0; - }; 94862F8310BA182500CAA2EB /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94C3696610AFB7550041953A /* NSBitmapImageRep.h */; @@ -3522,16 +3370,6 @@ path = /Users/johnmci/Shared/JSqueak/BitBlt.java; sourceTree = "<absolute>"; }; - 948704B20E12CABF00D565C3 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E659060DDD03FE00358328 /* Matrix2x3Plugin.c */; - name = "Matrix2x3Plugin.c: 629"; - rLen = 25; - rLoc = 18495; - rType = 0; - vrLen = 1410; - vrLoc = 0; - }; 9487071F0E132B1000D565C3 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 948707200E132B1000D565C3 /* sqGnu.h */; @@ -3554,36 +3392,6 @@ sepNavWindowFrame = "{{786, 18}, {1326, 1010}}"; }; }; - 9487755C10C64FF100E4AEC5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E6591F0DDD03FE00358328 /* ZipPlugin.c */; - name = "ZipPlugin.c: 54"; - rLen = 11; - rLoc = 1700; - rType = 0; - vrLen = 2153; - vrLoc = 710; - }; - 9487755D10C64FF100E4AEC5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E6591D0DDD03FE00358328 /* UUIDPlugin.c */; - name = "UUIDPlugin.c: 114"; - rLen = 19; - rLoc = 2745; - rType = 0; - vrLen = 1164; - vrLoc = 2105; - }; - 9487756010C64FF100E4AEC5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658EA0DDD03FE00358328 /* BitBltPlugin.c */; - name = "BitBltPlugin.c: 254"; - rLen = 21; - rLoc = 10581; - rType = 0; - vrLen = 730; - vrLoc = 9968; - }; 94883B400E0C2B9C005A4738 /* sqUnixSocket.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1283, 26936}}"; @@ -3732,26 +3540,6 @@ vrLen = 1549; vrLoc = 51264; }; - 9492B2F411F159F200EDB3D3 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494932D11E527180019BC29 /* sqUnixThreads.c */; - name = "sqUnixThreads.c: 19"; - rLen = 13; - rLoc = 428; - rType = 0; - vrLen = 1103; - vrLoc = 0; - }; - 9492B3D511F166A100EDB3D3 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 949492C611E51C6B0019BC29 /* sqTicker.c */; - name = "sqTicker.c: 212"; - rLen = 0; - rLoc = 7347; - rType = 0; - vrLen = 1506; - vrLoc = 6448; - }; 9493E98F10EE90BC000C4FB3 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94360A8C10E84CC90060221A /* NSException.h */; @@ -3852,23 +3640,6 @@ sepNavWindowFrame = "{{15, 4}, {1573, 1024}}"; }; }; - 9494933A11E5274B0019BC29 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494933B11E5274B0019BC29 /* malloc.h */; - name = "malloc.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 39; - vrLoc = 0; - }; - 9494933B11E5274B0019BC29 /* malloc.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = malloc.h; - path = "/Volumes/330GB Photos/Cog/platforms/Mac OS/vm/malloc.h"; - sourceTree = "<absolute>"; - }; 9494934011E5274B0019BC29 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94BCE6660DDDEB5000F38F31 /* sqMacHostWindow.h */; @@ -3896,7 +3667,7 @@ rLen = 17; rLoc = 2588; rType = 0; - vrLen = 1523; + vrLen = 1446; vrLoc = 1226; }; 9494935011E527AB0019BC29 /* sqMemoryFence.h */ = { @@ -4245,26 +4016,6 @@ sepNavVisRange = "{1158, 1564}"; }; }; - 94A3EDC8122842CD00DF449D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - name = "sqSqueakOSXNSView.m: 174"; - rLen = 0; - rLoc = 5911; - rType = 0; - vrLen = 1913; - vrLoc = 5772; - }; - 94A3F91B11E6564F008113C6 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 949492C311E51C6B0019BC29 /* sqExternalSemaphores.c */; - name = "sqExternalSemaphores.c: 189"; - rLen = 0; - rLoc = 6923; - rType = 0; - vrLen = 1829; - vrLoc = 5722; - }; 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94AB2E6B0E003879006A79E4 /* npsqueak.c */; @@ -4299,6 +4050,16 @@ path = "/Users/johnmci/Documents/SqueakBrowserPlugin/platforms/Mac OS/vm/npsqueak copy/npsqueak.c"; sourceTree = "<absolute>"; }; + 94AB33341229A67B00F77B62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */; + name = "sqSqueakOSXNSView.h: 34"; + rLen = 0; + rLoc = 1683; + rType = 0; + vrLen = 1646; + vrLoc = 777; + }; 94AF3A1F12231A7200691409 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94A1B0050E0DBE2400EB5EFC /* sqSqueakMainApplication+events.h */; @@ -4427,16 +4188,6 @@ sepNavWindowFrame = "{{15, 9}, {1078, 1014}}"; }; }; - 94B954A010E6D0F700DC476A /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 944069CD10E6B63200353B27 /* MacMenubarPlugin.c */; - name = "MacMenubarPlugin.c: 711"; - rLen = 6; - rLoc = 20318; - rType = 0; - vrLen = 1584; - vrLoc = 19909; - }; 94BCAAE810AB6C3500F87527 /* NSFileManager.h */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -4634,16 +4385,6 @@ sepNavWindowFrame = "{{15, 59}, {1394, 964}}"; }; }; - 94BCE7390DDDEF8200F38F31 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E659080DDD03FE00358328 /* MIDIPlugin.c */; - name = "MIDIPlugin.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 864; - vrLoc = 0; - }; 94BCE7870DDDF61200F38F31 /* sqUnixUUID.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1283, 633}}"; @@ -4700,17 +4441,17 @@ }; 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 1079}}"; + sepNavIntBoundsRect = "{{0, 0}, {1167, 1157}}"; sepNavSelRange = "{1683, 0}"; - sepNavVisRange = "{777, 1981}"; + sepNavVisRange = "{713, 1665}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; }; }; 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1244, 10400}}"; - sepNavSelRange = "{5911, 0}"; - sepNavVisRange = "{5688, 1950}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 10127}}"; + sepNavSelRange = "{6536, 4}"; + sepNavVisRange = "{4218, 2524}"; sepNavWindowFrame = "{{10, 7}, {1076, 1021}}"; }; }; @@ -5035,16 +4776,6 @@ sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; - 94C83E751228B6D10021DA2B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494932E11E527180019BC29 /* sqUnixVMProfile.c */; - name = "sqUnixVMProfile.c: 286"; - rLen = 3; - rLoc = 7363; - rType = 0; - vrLen = 1339; - vrLoc = 6688; - }; 94C887D410ADCC0D007CB39E /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94C887D510ADCC0D007CB39E /* NSThread.h */; @@ -5106,17 +4837,17 @@ }; 94C88BDD10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 676}}"; - sepNavSelRange = "{965, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1167, 676}}"; + sepNavSelRange = "{1951, 23}"; sepNavVisRange = "{279, 1758}"; sepNavWindowFrame = "{{15, 4}, {1392, 1019}}"; }; }; 94C88BDE10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 1014}}"; - sepNavSelRange = "{2588, 17}"; - sepNavVisRange = "{1226, 1523}"; + sepNavIntBoundsRect = "{{0, 0}, {1167, 988}}"; + sepNavSelRange = "{2405, 17}"; + sepNavVisRange = "{1799, 873}"; sepNavWindowFrame = "{{15, 49}, {1346, 974}}"; }; }; @@ -5127,26 +4858,6 @@ path = /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSGeometry.h; sourceTree = "<absolute>"; }; - 94CA691410B1CAD8007F207C /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E6590E0DDD03FE00358328 /* SecurityPlugin.c */; - name = "SecurityPlugin.c: 109"; - rLen = 14; - rLoc = 3415; - rType = 0; - vrLen = 1013; - vrLoc = 2696; - }; - 94CFE4AF10BE3CA600847DF5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E659120DDD03FE00358328 /* SoundCodecPrims.c */; - name = "SoundCodecPrims.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1395; - vrLoc = 0; - }; 94CFE6A910BE63A900847DF5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94C207E910AF66D7002F4160 /* NSWindow.h */; @@ -5211,16 +4922,6 @@ path = /Users/johnmci/Documents/Squeak3.8.0/src/vm/interp.c; sourceTree = "<absolute>"; }; - 94D124C311E6DCD000AAF81C /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94BCE7A60DDDF8F800F38F31 /* sqaio.h */; - name = "sqaio.h: 95"; - rLen = 16; - rLoc = 4027; - rType = 0; - vrLen = 2321; - vrLoc = 1767; - }; 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94D16BFD10BCEFEE00A69A89 /* Document.m */; @@ -5873,16 +5574,6 @@ vrLen = 2286; vrLoc = 4217; }; - 94D7403C10B5FDDB00F8C034 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E659020DDD03FE00358328 /* Klatt.c */; - name = "Klatt.c: 188"; - rLen = 20; - rLoc = 4929; - rType = 0; - vrLen = 1387; - vrLoc = 4016; - }; 94D740B210B6242000F8C034 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94D740B310B6242000F8C034 /* mman.h */; @@ -6848,20 +6539,10 @@ ignoreCount = 0; lineNumber = 177; location = Squeak; - modificationTime = 304662255.943404; + modificationTime = 304671821.513196; originalNumberOfMultipleMatches = 1; state = 1; }; - 94E8FA5712258FA800EECD29 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494928011E5178D0019BC29 /* gcc3x-cointerp.c */; - name = "gcc3x-cointerp.c: 12727"; - rLen = 16; - rLoc = 412648; - rType = 0; - vrLen = 2071; - vrLoc = 1123634; - }; 94E8FA6512258FDF00EECD29 /* sqMacV2Memory.c:191 */ = { isa = PBXFileBreakpoint; actions = ( @@ -6876,7 +6557,7 @@ ignoreCount = 0; lineNumber = 191; location = Squeak; - modificationTime = 304662255.976804; + modificationTime = 304671821.537101; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -6952,63 +6633,6 @@ sepNavVisRange = "{0, 586}"; }; }; - 94EF6CFA11E55BAC003BA64D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494927D11E5178D0019BC29 /* cogit.c */; - name = "cogit.c: 9539"; - rLen = 0; - rLoc = 358785; - rType = 0; - vrLen = 1729; - vrLoc = 357650; - }; - 94EF6CFB11E55BAC003BA64D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494927E11E5178D0019BC29 /* cogit.h */; - name = "cogit.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 3035; - vrLoc = 0; - }; - 94EF6CFD11E55BAC003BA64D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494928111E5178D0019BC29 /* cointerp.h */; - name = "cointerp.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 2731; - vrLoc = 0; - }; - 94EF6CFF11E55BAC003BA64D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94EF6D0011E55BAC003BA64D /* sqUnixUUID.c */; - name = "sqUnixUUID.c: 2"; - rLen = 0; - rLoc = 38; - rType = 0; - vrLen = 260; - vrLoc = 0; - }; - 94EF6D0011E55BAC003BA64D /* sqUnixUUID.c */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = sqUnixUUID.c; - path = "/Volumes/330GB Photos/Cog/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c"; - sourceTree = "<absolute>"; - }; - 94EF6FD211E57601003BA64D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E659100DDD03FE00358328 /* SocketPlugin.c */; - name = "SocketPlugin.c: 162"; - rLen = 37; - rLoc = 5715; - rType = 0; - vrLen = 1976; - vrLoc = 4742; - }; 94EF702B11E57954003BA64D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 942F761C0E0B6B6100848BF2 /* sqSqueakIPhoneApplication.m */; @@ -7019,23 +6643,6 @@ vrLen = 2492; vrLoc = 711; }; - 94EF706311E579BA003BA64D /* sqPlatformSpecific.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = sqPlatformSpecific.h; - path = "/Volumes/330GB Photos/Cog/platforms/unix/vm/sqPlatformSpecific.h"; - sourceTree = "<absolute>"; - }; - 94EF709B11E57D20003BA64D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94EF706311E579BA003BA64D /* sqPlatformSpecific.h */; - name = "sqPlatformSpecific.h: 9"; - rLen = 1; - rLoc = 361; - rType = 0; - vrLen = 2456; - vrLoc = 0; - }; 94F155570E83EA1F001657CE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94B88C640E81500200C98131 /* SqueakObjcBridge.m */; @@ -7355,26 +6962,6 @@ vrLen = 1533; vrLoc = 0; }; - 94FE720B122089FC00417A56 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94EF6CC011E55947003BA64D /* interp.h */; - name = "interp.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 586; - vrLoc = 0; - }; - 94FE723E12208E9300417A56 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94EF6CBE11E55947003BA64D /* gcc3x-interp.c */; - name = "gcc3x-interp.c: 31091"; - rLen = 10; - rLoc = 899796; - rType = 0; - vrLen = 1693; - vrLoc = 899252; - }; 94FE724012208E9300417A56 /* PlistBookmark */ = { isa = PlistBookmark; fRef = 94C36C9710B0CF290041953A /* Info-iPhone.plist */; Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj 2010-08-28 07:03:11 UTC (rev 2266) +++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj 2010-08-29 05:20:46 UTC (rev 2267) @@ -2396,7 +2396,7 @@ GCC_VERSION = ""; INFOPLIST_FILE = "SqueakPureObjc-InfoCOG.plist"; MACOSX_DEPLOYMENT_TARGET = 10.5; - PER_ARCH_CFLAGS_i386 = "-DLSB_FIRST -mfpmath=sse -finline-functions -fomit-frame-pointer -fno-cse-follow-jumps -fno-gcse -mtune=prescott -march=pentium-m "; + PER_ARCH_CFLAGS_i386 = "-DLSB_FIRST -mfpmath=sse -finline-functions -fomit-frame-pointer -fno-cse-follow-jumps -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16"; PRODUCT_NAME = Squeak; SDKROOT = macosx10.6; };

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2010