diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
| commit | 0669a40347ffa233bc6042b0f65d244509a61394 (patch) | |
| tree | 36a4577bdaa1ed28ca1ad222a54777012dd2dda8 /freetrackclient/ftclient.h | |
| parent | 72540e0a96a3120a5d02271e714aba29e136ab78 (diff) | |
| parent | 7454496476ba17ea622781d280606161581c9544 (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2
Resolved conflicts manually in files:
ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
Diffstat (limited to 'freetrackclient/ftclient.h')
| -rw-r--r-- | freetrackclient/ftclient.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/freetrackclient/ftclient.h b/freetrackclient/ftclient.h deleted file mode 100644 index 406e1237..00000000 --- a/freetrackclient/ftclient.h +++ /dev/null @@ -1,30 +0,0 @@ -/** @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
|