Merge branch 'master' of https://github.com/worklist/hifi into 20224

This commit is contained in:
Thijs Wenker 2015-02-08 17:49:03 +01:00
commit b532119db7

View file

@ -15,8 +15,10 @@
#include "Menu.h"
#include "SharedUtil.h"
#ifdef HAVE_RSSDK
const int PALMROOT_NUM_JOINTS = 3;
const int FINGER_NUM_JOINTS = 4;
#endif // HAVE_RSSDK
const DeviceTracker::Name RealSense::NAME = "RealSense";