diff options
| author | Chris Kiefer <chrisk13fer@gmail.com> | 2012-02-22 12:10:20 +0000 |
|---|---|---|
| committer | Chris Kiefer <chrisk13fer@gmail.com> | 2012-02-22 12:10:20 +0000 |
| commit | 0c65d2ad2162db3ffbea3e3175675ad4b4598688 (patch) | |
| tree | 5b1d6bd8b9dbe4069b8bf1a9bddb374d957c2cab /ofxMaxim/ofMaximExample007OSX/src/main.cpp | |
| parent | 9f073116e8b21af58415204edecf42fec5f2c3ed (diff) | |
| parent | bb60cd352f53f4600913d2152032dd4aff228520 (diff) | |
resolved merge conflicts
Diffstat (limited to 'ofxMaxim/ofMaximExample007OSX/src/main.cpp')
| -rw-r--r-- | ofxMaxim/ofMaximExample007OSX/src/main.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ofxMaxim/ofMaximExample007OSX/src/main.cpp b/ofxMaxim/ofMaximExample007OSX/src/main.cpp deleted file mode 100644 index 6a32c6a..0000000 --- a/ofxMaxim/ofMaximExample007OSX/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()); - -} |