resolve conflicts with master

ircam-ismm · Jan 30, 2016 · 31a980c · 31a980c
2 parents 3ed74ff + f72393e
commit 31a980c
Show file tree

Hide file tree

Showing 10 changed files with 1,207 additions and 82 deletions.
diff --git a/...eproj/project.xcworkspace/xcuserdata/caramiaux.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/caramiaux.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MaxMSP/xcode/gvf.xcodeproj/xcuserdata/caramiaux.xcuserdatad/xcschemes/gvf.xcscheme b/MaxMSP/xcode/gvf.xcodeproj/xcuserdata/caramiaux.xcuserdatad/xcschemes/gvf.xcscheme
@@ -14,9 +14,15 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
+<<<<<<< HEAD:MaxMSP/xcode/gvf.xcodeproj/xcuserdata/caramiaux.xcuserdatad/xcschemes/gvf.xcscheme
                BlueprintIdentifier = "369473B20FD5C3DC00A5E9FD"
                BuildableName = "gvf.mxo"
                BlueprintName = "gvf"
+=======
+               BlueprintIdentifier = "2FBBEAD608F335360078DB84"
+               BuildableName = "gvf.bundle"
+               BlueprintName = "max-external"
+>>>>>>> f72393e2ef796f41f0df14d9020afefd53bd3115:example-maxmsp/gvf.xcodeproj/xcuserdata/caramiaux.xcuserdatad/xcschemes/max-external.xcscheme
                ReferencedContainer = "container:gvf.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>