M  .gitignore
M  detect/detect.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/UserInterfaceState.xcuserstate
A  release/Makefile
A  release/Project.xcconfig
A  release/addons.make
A  release/bin/data/.gitkeep
A  release/config.make
A  release/openFrameworks-Info.plist
A  release/release.xcodeproj/project.pbxproj
A  release/release.xcodeproj/project.xcworkspace/contents.xcworkspacedata
A  release/release.xcodeproj/project.xcworkspace/xcshareddata/release.xccheckout
A  release/release.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/UserInterfaceState.xcuserstate
A  "release/release.xcodeproj/xcshareddata/xcschemes/release Debug.xcscheme"
A  "release/release.xcodeproj/xcshareddata/xcschemes/release Release.xcscheme"
A  release/release.xcodeproj/xcuserdata/ty.xcuserdatad/xcschemes/xcschememanagement.plist
A  release/src/Bibibi.cpp
A  release/src/Bibibi.hpp
A  release/src/Blank.cpp
A  release/src/Blank.hpp
A  release/src/Moire.cpp
A  release/src/Moire.hpp
A  release/src/Orgel.cpp
A  release/src/Orgel.hpp
A  release/src/Scene.cpp
A  release/src/Scene.hpp
A  release/src/Scratch.cpp
A  release/src/Scratch.hpp
A  release/src/Test.cpp
A  release/src/Test.hpp
A  release/src/Tile.cpp
A  release/src/Tile.hpp
A  release/src/config.hpp
A  release/src/main.cpp
A  release/src/ofApp.cpp
A  release/src/ofApp.h
A  release/src/ofxMultiGLFWWindow.cpp
A  release/src/ofxMultiGLFWWindow.h
A  release/src/osc.cpp
A  release/src/osc.hpp
M  test00/sconstruct
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  test00/src/config.hpp
M  test00/test00.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/UserInterfaceState.xcuserstate