resolving merge conflict

1 files changed, 0 insertions, 42 deletions

diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/testApp.h b/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/testApp.h
deleted file mode 100755
index f0eb9d8..0000000
--- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/src/testApp.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _TEST_APP
-#define _TEST_APP
-
-
-#include "ofMain.h"
-#include "maximilian.h"
-
-class testApp : 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);
-		
-		void audioOut(float * input, int bufferSize, int nChannels);
-		
-		
-		ofSoundStream soundStream;
-
-		int		sampleRate;
-
-		vector <float> lAudio;
-		vector <float> rAudio;
-		
-		//------------------- for the simple sine wave synthesis
-
-		maxiOsc test1;
-		double sample;
-};
-
-#endif