Nissim Hadar e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # interface/resources/qml/js/Utils.jsc		2018-01-04 15:58:08 -08:00
..
developer	Added sun intensity modulation as a function of altitude.	2017-12-29 23:47:42 -08:00
modules	request module updates	2017-05-03 07:32:23 -07:00
system	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-04 15:58:08 -08:00
tutorials	Fixing global declarations in JS	2017-11-15 12:00:52 -08:00
defaultScripts.js	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00