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/ofMaximExample007OSX_Granular/emptyExample.xcodeproj/project.xcworkspace | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/emptyExample.xcodeproj/project.xcworkspace')
2 files changed, 0 insertions, 7 deletions
diff --git a/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/emptyExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/emptyExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index da00dc2..0000000 --- a/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/emptyExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Workspace - version = "1.0"> - <FileRef - location = "self:emptyExample.xcodeproj"> - </FileRef> -</Workspace> diff --git a/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/emptyExample.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/emptyExample.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate Binary files differdeleted file mode 100644 index 29b5c4c..0000000 --- a/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/emptyExample.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate +++ /dev/null |