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/iOS/ofxMaximiPhone0062Example/bin | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin')
| -rw-r--r-- | ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/Default.png | bin | 5518 -> 0 bytes |
| -rw-r--r-- | ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/Icon.png | bin | 1040 -> 0 bytes |
| -rw-r--r-- | ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/beat2.wav | bin | 211140 -> 0 bytes |
| -rw-r--r-- | ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/remoteatmos.wav | bin | 2798636 -> 0 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/Default.png b/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/Default.png Binary files differdeleted file mode 100644 index e782497..0000000 --- a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/Default.png +++ /dev/null diff --git a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/Icon.png b/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/Icon.png Binary files differdeleted file mode 100644 index 2d926c8..0000000 --- a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/Icon.png +++ /dev/null diff --git a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/beat2.wav b/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/beat2.wav Binary files differdeleted file mode 100644 index c71cee6..0000000 --- a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/beat2.wav +++ /dev/null diff --git a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/remoteatmos.wav b/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/remoteatmos.wav Binary files differdeleted file mode 100644 index 87e3cdf..0000000 --- a/ofxMaxim/examples/iOS/ofxMaximiPhone0062Example/bin/data/remoteatmos.wav +++ /dev/null |
