# HG changeset patch # User Henrik Ekeus # Date 1328113052 0 # Node ID 95626beb91abf218970bd1fc5a78c1ad333a491f # Parent 8bb99cbe33411dfeebd623420d478f142401acb9# Parent 055d7524bae4a2a2918de6ca4ea52d3ed193f92c Merge diff -r 055d7524bae4 -r 95626beb91ab MelodyTriangle.xcodeproj/hekeus.mode1v3 --- a/MelodyTriangle.xcodeproj/hekeus.mode1v3 Tue Jan 31 23:44:01 2012 +0000 +++ b/MelodyTriangle.xcodeproj/hekeus.mode1v3 Wed Feb 01 16:17:32 2012 +0000 @@ -197,48 +197,7 @@ Notifications OpenEditors - - - Content - - PBXProjectModuleGUID - C84FFCE814CDB8BC00D92A44 - PBXProjectModuleLabel - melodyTriangle.cpp - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - C84FFCEE14CDB9DE00D92A44 - PBXProjectModuleLabel - melodyTriangle.cpp - _historyCapacity - 0 - bookmark - C8C55A7414D219B800DE2448 - history - - C8D33D1614D0843D00191D50 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {971, 633}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 293 60 971 674 0 0 1280 778 - - - + PerspectiveWidths -1 @@ -306,13 +265,14 @@ E4B69B4A0A3A1720003C02F2 E4B69E1C0A3A1BDC003C02F2 + C8B1A90514C47861003CDFD0 1C37FBAC04509CD000000102 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 9 + 12 3 0 @@ -355,7 +315,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - melodyTriangle.cpp + main.cpp PBXSplitModuleInNavigatorKey Split0 @@ -363,11 +323,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - melodyTriangle.cpp + main.cpp _historyCapacity 0 bookmark - C8C55A7114D219B800DE2448 + C8C55A8F14D21C8000DE2448 history C8E1DA3A14BF6043000A0193 @@ -376,9 +336,9 @@ C852882B14CC47A200AE6996 C852882C14CC47A200AE6996 C84FFCD314CDB71400D92A44 - C84FFD2414CEF9C400D92A44 - C84FFD2514CEF9C400D92A44 - C8D33D1514D0843D00191D50 + C8C55A8C14D21C8000DE2448 + C8C55A8D14D21C8000DE2448 + C8C55A8E14D21C8000DE2448 SplitCount @@ -578,8 +538,11 @@ 5 WindowOrderList + C8C55A9714D21C8000DE2448 + C8C55A9814D21C8000DE2448 + 1CD10A99069EF8BA00B06720 C859AFFA140D23E1002C5ACF - C84FFCE814CDB8BC00D92A44 + 1C78EAAD065D492600B07095 /Users/hekeus/Documents/QMUL/InfoDynInstallation/melodytriangle/of_preRelease_v0062_osxSL_FAT/apps/examples/MelodyTriangle/MelodyTriangle.xcodeproj WindowString @@ -604,7 +567,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + main.cpp StatusBarVisibility @@ -621,6 +584,8 @@ 218pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -673,7 +638,7 @@ WindowToolGUID C859AFFA140D23E1002C5ACF WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -782,13 +747,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - C8D33D0914D0645600191D50 + C8C55A9014D21C8000DE2448 1C162984064C10D400B95A72 - C8D33D0A14D0645600191D50 - C8D33D0B14D0645600191D50 - C8D33D0C14D0645600191D50 - C8D33D0D14D0645600191D50 - C8D33D0E14D0645600191D50 + C8C55A9114D21C8000DE2448 + C8C55A9214D21C8000DE2448 + C8C55A9314D21C8000DE2448 + C8C55A9414D21C8000DE2448 + C8C55A9514D21C8000DE2448 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -915,6 +880,8 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -950,7 +917,7 @@ TableOfContents 1C78EAAD065D492600B07095 - C8D33D0F14D0645600191D50 + C8C55A9614D21C8000DE2448 1C78EAAC065D492600B07095 ToolbarConfiguration @@ -960,7 +927,7 @@ WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff -r 055d7524bae4 -r 95626beb91ab MelodyTriangle.xcodeproj/hekeus.pbxuser --- a/MelodyTriangle.xcodeproj/hekeus.pbxuser Tue Jan 31 23:44:01 2012 +0000 +++ b/MelodyTriangle.xcodeproj/hekeus.pbxuser Wed Feb 01 16:17:32 2012 +0000 @@ -10,26 +10,6 @@ vrLen = 547; vrLoc = 155; }; - C84FFD2414CEF9C400D92A44 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; - name = "main.cpp: 26"; - rLen = 0; - rLoc = 825; - rType = 0; - vrLen = 807; - vrLoc = 0; - }; - C84FFD2514CEF9C400D92A44 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = C8E1D9DA14BF50E0000A0193 /* melodyTriangle.h */; - name = "melodyTriangle.h: 15"; - rLen = 0; - rLoc = 230; - rType = 0; - vrLen = 852; - vrLoc = 0; - }; C85286B614C4C91A00AE6996 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = C85286B714C4C91A00AE6996 /* cmath */; @@ -113,26 +93,6 @@ vrLen = 477; vrLoc = 0; }; - C858DABC14D0643D0009C9DF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */; - name = "melodyTriangle.cpp: 123"; - rLen = 0; - rLoc = 4083; - rType = 0; - vrLen = 1413; - vrLoc = 2427; - }; - C858DABD14D0643D0009C9DF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */; - name = "melodyTriangle.cpp: 19"; - rLen = 0; - rLoc = 488; - rType = 0; - vrLen = 1327; - vrLoc = 56; - }; C859AFF1140D23D3002C5ACF /* MelodyTriangle */ = { isa = PBXExecutable; activeArgIndices = ( @@ -177,45 +137,44 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - C8C55A7114D219B800DE2448 /* PBXTextBookmark */ = { + C8C55A8C14D21C8000DE2448 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = C8E1D9DA14BF50E0000A0193 /* melodyTriangle.h */; + name = "melodyTriangle.h: 15"; + rLen = 0; + rLoc = 230; + rType = 0; + vrLen = 900; + vrLoc = 22; + }; + C8C55A8D14D21C8000DE2448 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */; - name = "melodyTriangle.cpp: 116"; + name = "melodyTriangle.cpp: 85"; rLen = 0; - rLoc = 3808; + rLoc = 2409; rType = 0; - vrLen = 1342; - vrLoc = 2427; + vrLen = 1142; + vrLoc = 1278; }; - C8C55A7414D219B800DE2448 /* PBXTextBookmark */ = { + C8C55A8E14D21C8000DE2448 /* XCBuildMessageTextBookmark */ = { isa = PBXTextBookmark; - fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */; - name = "melodyTriangle.cpp: 19"; + comments = "No matching function for call to 'melodyTriangle::melodyTriangle(const char*, int, int, int, int)'"; + fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 26; + rType = 1; + }; + C8C55A8F14D21C8000DE2448 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; + name = "main.cpp: 28"; rLen = 0; - rLoc = 488; + rLoc = 873; rType = 0; - vrLen = 1327; - vrLoc = 56; - }; - C8D33D1514D0843D00191D50 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */; - name = "melodyTriangle.cpp: 116"; - rLen = 0; - rLoc = 3808; - rType = 0; - vrLen = 1342; - vrLoc = 2427; - }; - C8D33D1614D0843D00191D50 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */; - name = "melodyTriangle.cpp: 19"; - rLen = 0; - rLoc = 488; - rType = 0; - vrLen = 1327; - vrLoc = 56; + vrLen = 884; + vrLoc = 0; }; C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */ = { uiCtxt = { @@ -345,20 +304,16 @@ PBXWorkspaceStateSaveDate = 349313459; }; perUserProjectItems = { - C84FFCD314CDB71400D92A44 = C84FFCD314CDB71400D92A44 /* PBXTextBookmark */; - C84FFD2414CEF9C400D92A44 = C84FFD2414CEF9C400D92A44 /* PBXTextBookmark */; - C84FFD2514CEF9C400D92A44 = C84FFD2514CEF9C400D92A44 /* PBXTextBookmark */; - C85286B614C4C91A00AE6996 = C85286B614C4C91A00AE6996 /* PBXTextBookmark */; - C852882A14CC47A200AE6996 = C852882A14CC47A200AE6996 /* PBXTextBookmark */; - C852882B14CC47A200AE6996 = C852882B14CC47A200AE6996 /* PBXTextBookmark */; - C852882C14CC47A200AE6996 = C852882C14CC47A200AE6996 /* PBXTextBookmark */; - C858DABC14D0643D0009C9DF = C858DABC14D0643D0009C9DF /* PBXTextBookmark */; - C858DABD14D0643D0009C9DF = C858DABD14D0643D0009C9DF /* PBXTextBookmark */; - C8C55A7114D219B800DE2448 /* PBXTextBookmark */ = C8C55A7114D219B800DE2448 /* PBXTextBookmark */; - C8C55A7414D219B800DE2448 /* PBXTextBookmark */ = C8C55A7414D219B800DE2448 /* PBXTextBookmark */; - C8D33D1514D0843D00191D50 = C8D33D1514D0843D00191D50 /* PBXTextBookmark */; - C8D33D1614D0843D00191D50 = C8D33D1614D0843D00191D50 /* PBXTextBookmark */; - C8E1DA3A14BF6043000A0193 = C8E1DA3A14BF6043000A0193 /* PlistBookmark */; + C84FFCD314CDB71400D92A44 /* PBXTextBookmark */ = C84FFCD314CDB71400D92A44 /* PBXTextBookmark */; + C85286B614C4C91A00AE6996 /* PBXTextBookmark */ = C85286B614C4C91A00AE6996 /* PBXTextBookmark */; + C852882A14CC47A200AE6996 /* PBXTextBookmark */ = C852882A14CC47A200AE6996 /* PBXTextBookmark */; + C852882B14CC47A200AE6996 /* PBXTextBookmark */ = C852882B14CC47A200AE6996 /* PBXTextBookmark */; + C852882C14CC47A200AE6996 /* PBXTextBookmark */ = C852882C14CC47A200AE6996 /* PBXTextBookmark */; + C8C55A8C14D21C8000DE2448 /* PBXTextBookmark */ = C8C55A8C14D21C8000DE2448 /* PBXTextBookmark */; + C8C55A8D14D21C8000DE2448 /* PBXTextBookmark */ = C8C55A8D14D21C8000DE2448 /* PBXTextBookmark */; + C8C55A8E14D21C8000DE2448 /* XCBuildMessageTextBookmark */ = C8C55A8E14D21C8000DE2448 /* XCBuildMessageTextBookmark */; + C8C55A8F14D21C8000DE2448 /* PBXTextBookmark */ = C8C55A8F14D21C8000DE2448 /* PBXTextBookmark */; + C8E1DA3A14BF6043000A0193 /* PlistBookmark */ = C8E1DA3A14BF6043000A0193 /* PlistBookmark */; }; sourceControlManager = C859B006140D23E1002C5ACF /* Source Control */; userBuildSettings = { @@ -372,9 +327,9 @@ }; E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {831, 552}}"; - sepNavSelRange = "{873, 0}"; - sepNavVisRange = "{0, 884}"; + sepNavIntBoundsRect = "{{0, 0}, {719, 416}}"; + sepNavSelRange = "{790, 0}"; + sepNavVisRange = "{439, 445}"; sepNavWindowFrame = "{{15, 43}, {971, 730}}"; }; };