Thijs Wenker 4d12a6d81c Merge branch 'master' of https://github.com/worklist/hifi into 20245 ... Conflicts: examples/notifications.js		2015-02-17 23:30:58 +01:00
..
gamepad
hydra	use injector restart in airGuitar script	2015-02-12 11:44:14 -08:00
leap
oculus	Merge branch 'master' of https://github.com/worklist/hifi into 20245	2015-02-17 23:30:58 +01:00
RealSense