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/OSX/ofMaximExample007OSX_Granular/src/main.cpp | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/src/main.cpp')
| -rw-r--r-- | ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/src/main.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/src/main.cpp b/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/src/main.cpp deleted file mode 100644 index 6a32c6a..0000000 --- a/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/src/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "ofMain.h" -#include "testApp.h" -#include "ofAppGlutWindow.h" - -//======================================================================== -int main( ){ - - ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context - - // this kicks off the running of my app - // can be OF_WINDOW or OF_FULLSCREEN - // pass in width and height too: - ofRunApp( new testApp()); - -} |