resolving merge conflict

1 files changed, 10 insertions, 0 deletions

diff --git a/ofxMaxim/openFrameworksExamples/windows/ofxMaximExampleVS2010-OF0072/src/main.cpp b/ofxMaxim/openFrameworksExamples/windows/ofxMaximExampleVS2010-OF0072/src/main.cpp
new file mode 100644
index 0000000..872a5b5
--- /dev/null
+++ b/ofxMaxim/openFrameworksExamples/windows/ofxMaximExampleVS2010-OF0072/src/main.cpp
@@ -0,0 +1,10 @@
+#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
+}