resolving merge conflict

1 files changed, 23 insertions, 0 deletions

diff --git a/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/ofApp.h b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/ofApp.h
new file mode 100644
index 0000000..6d640be
--- /dev/null
+++ b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/ofApp.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "ofMain.h"
+#include "ofxMaxim.h"
+
+class ofApp : public ofBaseApp{
+	public:
+		void setup();
+		void update();
+		void draw();
+		
+		void keyPressed(int key);
+		void keyReleased(int key);
+		void mouseMoved(int x, int y);
+		void mouseDragged(int x, int y, int button);
+		void mousePressed(int x, int y, int button);
+		void mouseReleased(int x, int y, int button);
+		void windowResized(int w, int h);
+		void dragEvent(ofDragInfo dragInfo);
+		void gotMessage(ofMessage msg);
+    
+    ofxMaxiSample sample;
+};