M  detect/detect.xcodeproj/project.xcworkspace/xcshareddata/detect.xccheckout
M  detect/detect.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/UserInterfaceState.xcuserstate
A  detect/detect.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/WorkspaceSettings.xcsettings
M  detect/src/main.cpp
M  detect/src/ofApp.cpp
M  detect/src/ofApp.h
M  test00/src/config.hpp
M  test00/test00.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of github.com:transfloor/main
M  detect/detect.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/UserInterfaceState.xcuserstate
M  detect/src/ofApp.cpp
M  test00/src/Test.cpp
M  test00/src/config.hpp
M  test00/src/osc.cpp
M  test00/test00.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/UserInterfaceState.xcuserstate