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

1 files changed, 10 insertions, 0 deletions

diff --git a/facetracknoir/qt-moc.h b/facetracknoir/qt-moc.h
new file mode 100644
index 00000000..8ccfffe8
--- /dev/null
+++ b/facetracknoir/qt-moc.h
@@ -0,0 +1,10 @@
+#include <QObject> 
+
+// this file exists only such that cmake qt automoc is appeased
+
+class AutomocMe : public QObject {
+  Q_OBJECT
+private:
+  virtual void foo() = 0;
+  AutomocMe() {}
+};