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

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 0 insertions, 10 deletions

diff --git a/facetracknoir/qt-moc.h b/facetracknoir/qt-moc.h
deleted file mode 100644
index 8ccfffe8..00000000
--- a/facetracknoir/qt-moc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#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() {}
-};