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/windows/ofxMaximExampleVS2010-OF0072/src/main.cpp | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/examples/windows/ofxMaximExampleVS2010-OF0072/src/main.cpp')
| -rw-r--r-- | ofxMaxim/examples/windows/ofxMaximExampleVS2010-OF0072/src/main.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/ofxMaxim/examples/windows/ofxMaximExampleVS2010-OF0072/src/main.cpp b/ofxMaxim/examples/windows/ofxMaximExampleVS2010-OF0072/src/main.cpp deleted file mode 100644 index 872a5b5..0000000 --- a/ofxMaxim/examples/windows/ofxMaximExampleVS2010-OF0072/src/main.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "testApp.h" -#include "ofAppGlutWindow.h" - -//-------------------------------------------------------------- -int main(){ - ofAppGlutWindow window; // create a window - // set width, height, mode (OF_WINDOW or OF_FULLSCREEN) - ofSetupOpenGL(&window, 1024, 768, OF_WINDOW); - ofRunApp(new testApp()); // start the app -} |