diff options
Diffstat (limited to '06_performance/src/main.cpp')
| -rw-r--r-- | 06_performance/src/main.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/06_performance/src/main.cpp b/06_performance/src/main.cpp index 464bd9d..169de94 100644 --- a/06_performance/src/main.cpp +++ b/06_performance/src/main.cpp @@ -5,13 +5,8 @@ int main( ){ //ofSetupOpenGL(4080,768, OF_WINDOW); // <-------- setup the GL context -<<<<<<< HEAD - ofSetupOpenGL(2400,450, OF_WINDOW); // <-------- setup the GL context -======= + //ofSetupOpenGL(2400,450, OF_WINDOW); // <-------- setup the GL context ofSetupOpenGL(1400,262, OF_WINDOW); // <-------- setup the GL context ->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e - - // this kicks off the running of my app // can be OF_WINDOW or OF_FULLSCREEN |