Merge branch 'pointers' of https://github.com/highfidelity/hifi into pointers

This commit is contained in:
SamGondelman 2017-10-17 13:23:08 -07:00
commit 975a3e5bbb
2 changed files with 6 additions and 0 deletions

View file

@ -1 +1,6 @@
#include "PointerManager.h"
PointerManager::PointerManager() {
}

View file

@ -15,6 +15,7 @@ class PointerManager : public QObject, public Dependency {
Q_OBJECT
SINGLETON_DEPENDENCY
public:
PointerManager();
signals:
void triggerBegin(const QUuid& id, const PointerEvent& pointerEvent);