diff options
| author | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
|---|---|---|
| committer | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
| commit | e4eb667af04304cbe9c0be5997ebea2049178590 (patch) | |
| tree | 5630e70df8199c9f53170c9ef4da1e4dac59e69c /ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata')
3 files changed, 0 insertions, 55 deletions
diff --git a/ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist b/ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index bc214d5..0000000 --- a/ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata/michaelgrierson.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,27 +0,0 @@ -<?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>SchemeUserState</key> - <dict> - <key>MaximExtractorExample Debug.xcscheme_^#shared#^_</key> - <dict> - <key>orderHint</key> - <integer>0</integer> - </dict> - <key>MaximExtractorExample Release.xcscheme_^#shared#^_</key> - <dict> - <key>orderHint</key> - <integer>1</integer> - </dict> - </dict> - <key>SuppressBuildableAutocreation</key> - <dict> - <key>E4B69B5A0A3A1756003C02F2</key> - <dict> - <key>primary</key> - <true/> - </dict> - </dict> -</dict> -</plist> diff --git a/ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata/rebecca.xcuserdatad/xcschemes/xcschememanagement.plist b/ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata/rebecca.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 13dfb6e..0000000 --- a/ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata/rebecca.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,14 +0,0 @@ -<?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> diff --git a/ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata/rollingsound.xcuserdatad/xcschemes/xcschememanagement.plist b/ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata/rollingsound.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 13dfb6e..0000000 --- a/ofxMaxim/examples/OSX/OF0.8.4MaximExtractorExample/MaximExtractorExample.xcodeproj/xcuserdata/rollingsound.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,14 +0,0 @@ -<?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> |