Merge conflicts fixed
Showing
- FlowTools_Example/FlowTools_Example.xcodeproj/project.xcworkspace/xcuserdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate 0 additions, 0 deletions...userdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate
- Kaleidoscope/Kaleidoscope.xcodeproj/project.pbxproj 18 additions, 4 deletionsKaleidoscope/Kaleidoscope.xcodeproj/project.pbxproj
- Kaleidoscope/Kaleidoscope.xcodeproj/project.xcworkspace/xcuserdata/EliotHeath.xcuserdatad/UserInterfaceState.xcuserstate 0 additions, 0 deletions...ata/EliotHeath.xcuserdatad/UserInterfaceState.xcuserstate
- Kaleidoscope/Kaleidoscope.xcodeproj/project.xcworkspace/xcuserdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate 0 additions, 0 deletions...userdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate
- Kaleidoscope/Kaleidoscope.xcodeproj/xcuserdata/dmanc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 5 additions, 0 deletions...ta/dmanc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
- Kaleidoscope/Kaleidoscope.xcodeproj/xcuserdata/dmanc.xcuserdatad/xcschemes/xcschememanagement.plist 14 additions, 0 deletions...data/dmanc.xcuserdatad/xcschemes/xcschememanagement.plist
- Kaleidoscope/Walker.cpp 13 additions, 19 deletionsKaleidoscope/Walker.cpp
- Kaleidoscope/src/Phasor.cpp 3 additions, 2 deletionsKaleidoscope/src/Phasor.cpp
- Kaleidoscope/src/Phasor.h 3 additions, 4 deletionsKaleidoscope/src/Phasor.h
- Kaleidoscope/src/Walker.h 7 additions, 4 deletionsKaleidoscope/src/Walker.h
- Kaleidoscope/src/ofApp.cpp 17 additions, 15 deletionsKaleidoscope/src/ofApp.cpp
- Kaleidoscope/src/ofApp.h 15 additions, 9 deletionsKaleidoscope/src/ofApp.h
- Kaleidoscope/src/ofxKaleido.cpp 42 additions, 0 deletionsKaleidoscope/src/ofxKaleido.cpp
- Kaleidoscope/src/ofxKaleido.h 39 additions, 0 deletionsKaleidoscope/src/ofxKaleido.h
- MaximOsc/MaximOsc.xcodeproj/project.xcworkspace/xcuserdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate 0 additions, 0 deletions...userdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate
- firstTry/bin/data/image.jpg 0 additions, 0 deletionsfirstTry/bin/data/image.jpg
- firstTry/firstTry.xcodeproj/project.xcworkspace/xcuserdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate 0 additions, 0 deletions...userdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate
- firstTry/src/main.cpp 4 additions, 4 deletionsfirstTry/src/main.cpp
- firstTry/src/ofApp.cpp 40 additions, 36 deletionsfirstTry/src/ofApp.cpp
- nFeedback/nFeedback.xcodeproj/project.xcworkspace/xcuserdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate 0 additions, 0 deletions...userdata/dmanc.xcuserdatad/UserInterfaceState.xcuserstate
Please register or sign in to comment