Thijs Wenker 5de4f8f249 Merge branch 'master' of https://github.com/worklist/hifi into 20224 ... Conflicts: examples/libraries/virtualKeyboard.js		2015-01-15 22:59:05 +01:00
..
gamepad	Incremental update to scripts cleanup	2015-01-06 15:47:25 -08:00
hydra	Changed references of global.js to a var	2015-01-15 10:48:31 -08:00
leap	More Script updates	2015-01-06 22:32:45 -08:00
oculus	cursor follows look at rotation now	2015-01-15 22:25:59 +01:00