Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 21:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/input-plugins
History
Brad Hefta-Gaub bab2a7d80f Merge branch 'controllers' of https://github.com/highfidelity/hifi into hardwareChanged 
Conflicts:
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
	libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
2015-10-29 10:56:01 -07:00
..
src/input-plugins Merge branch 'controllers' of https://github.com/highfidelity/hifi into hardwareChanged 2015-10-29 10:56:01 -07:00
CMakeLists.txt Remove DeviceProxy in favor of InputDevice 2015-10-29 09:32:56 -07:00