Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 2 insertions, 2 deletions

diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
index bb54c354..d522610b 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
@@ -1,5 +1,5 @@
 #include "ftnoir_protocol_libevdev.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
 
 LibevdevControls::LibevdevControls() : QWidget()
 {
@@ -20,7 +20,7 @@ void LibevdevControls::doCancel() {
 void LibevdevControls::save() {
 }
 
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog( )
 {
     return new LibevdevControls;
 }