resolved merge conflicts

1 files changed, 16 insertions, 0 deletions

diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/main.cpp b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/main.cpp
new file mode 100644
index 0000000..b232966
--- /dev/null
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/main.cpp
@@ -0,0 +1,16 @@
+#include "ofMain.h"
+#include "mp.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 mp());
+
+}