Dante Ruiz 37c51a7246 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates		2018-05-16 10:41:40 -07:00
..
controllerModules	Merge pull request #13167 from dback2/lowercaseUnequip	2018-05-15 10:55:19 -07:00
controllerDispatcher.js
controllerDisplay.js
controllerDisplayManager.js
controllerScripts.js
godView.js
grab.js
handTouch.js
squeezeHands.js
toggleAdvancedMovementForHandControllers.js	fixing some menu reog bugs	2018-05-16 10:40:28 -07:00
touchControllerConfiguration.js
viveControllerConfiguration.js