Merge branch 'master' of github.com:opentrack/opentrack

Conflicts:
	facetracknoir/tracker.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.h
	ftnoir_filter_base/ftnoir_filter_base.h
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 30 insertions, 30 deletions

diff --git a/freetrackclient/ftclient.h b/freetrackclient/ftclient.h
index 406e1237..5e5d8747 100644
--- a/freetrackclient/ftclient.h
+++ b/freetrackclient/ftclient.h
@@ -1,30 +1,30 @@
-/**   @file  

-     @brief  

-*/

-#pragma once

-#ifndef INCLUDED_FTCLIENT_H

-#define INCLUDED_FTCLIENT_H

- 

-

-

-

-

-  

-#include "Windows.h" 

-#include "SysUtils.h" 

-#include "FTTypes.h"

-

-/*__stdcall*/ bool FTGetData(PFreetrackData data); 

-/*__stdcall*/ void FTReportName(PAnsiChar name); 

-/*__stdcall*/ char* FTGetDllVersion(); 

-/*__stdcall*/ char* FTProvider(); 

-

-

-bool OpenMapping();

-void DestroyMapping();

-

-

-

-

-#endif//INCLUDED_FTCLIENT_H

-//END

+/**   @file  
+     @brief  
+*/
+#pragma once
+#ifndef INCLUDED_FTCLIENT_H
+#define INCLUDED_FTCLIENT_H
+ 
+
+
+
+
+  
+#include "Windows.h" 
+#include "SysUtils.h" 
+#include "FTTypes.h"
+
+/*__stdcall*/ bool FTGetData(PFreetrackData data); 
+/*__stdcall*/ void FTReportName(PAnsiChar name); 
+/*__stdcall*/ char* FTGetDllVersion(); 
+/*__stdcall*/ char* FTProvider(); 
+
+
+bool OpenMapping();
+void DestroyMapping();
+
+
+
+
+#endif//INCLUDED_FTCLIENT_H
+//END