Merge branch 'master' into UsbTrackerOnWin

# Conflicts:
#	src/survive_vive.c

1 files changed, 4 insertions, 1 deletions

diff --git a/calibrate_client.c b/calibrate_client.c
index f28520b..1a2ee41 100644
--- a/calibrate_client.c
+++ b/calibrate_client.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <os_generic.h>
 #include "src/survive_cal.h"
-#include <DrawFunctions.h>
+#include <CNFGFunctions.h>
 
 #include "src/survive_config.h"
 
@@ -35,6 +35,9 @@ void HandleButton( int x, int y, int button, int bDown )
 void HandleMotion( int x, int y, int mask )
 {
 }
+void HandleDestroy()
+{
+}
 
 int bufferpts[32*2*3];
 char buffermts[32*128*3];