aboutsummaryrefslogtreecommitdiffstats
path: root/ofxMaxim/openFrameworksExamples/OSX/emptyExample/emptyExample.xcodeproj/xcuserdata
diff options
context:
space:
mode:
authormick grierson <mickgrierson@gmail.com>2015-10-01 09:54:19 +0100
committermick grierson <mickgrierson@gmail.com>2015-10-01 09:54:19 +0100
commite4eb667af04304cbe9c0be5997ebea2049178590 (patch)
tree5630e70df8199c9f53170c9ef4da1e4dac59e69c /ofxMaxim/openFrameworksExamples/OSX/emptyExample/emptyExample.xcodeproj/xcuserdata
parent537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff)
parentdfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff)
resolving merge conflict
Diffstat (limited to 'ofxMaxim/openFrameworksExamples/OSX/emptyExample/emptyExample.xcodeproj/xcuserdata')
-rw-r--r--ofxMaxim/openFrameworksExamples/OSX/emptyExample/emptyExample.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist14
1 files changed, 14 insertions, 0 deletions
diff --git a/ofxMaxim/openFrameworksExamples/OSX/emptyExample/emptyExample.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/emptyExample.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..13dfb6e
--- /dev/null
+++ b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/emptyExample.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>SuppressBuildableAutocreation</key>
+ <dict>
+ <key>E4B69B5A0A3A1756003C02F2</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ </dict>
+</dict>
+</plist>