Merge branch 'master' into UsbTrackerOnWin

# Conflicts:
#	src/survive_vive.c

1 files changed, 5 insertions, 1 deletions

diff --git a/data_recorder.c b/data_recorder.c
index 206c6c3..46f3427 100644
--- a/data_recorder.c
+++ b/data_recorder.c
@@ -9,7 +9,7 @@
 #include <survive.h>
 #include <string.h>
 #include <os_generic.h>
-#include <DrawFunctions.h>
+#include <CNFGFunctions.h>
 
 struct SurviveContext * ctx;
 
@@ -35,6 +35,10 @@ void HandleMotion( int x, int y, int mask )
 {
 }
 
+void HandleDestroy()
+{
+}
+
 int bufferpts[32*2*3];
 char buffermts[32*128*3];
 int buffertimeto[32*3];