Nissim Hadar 7260b4ff7b Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # libraries/entities/src/EntityPropertyFlags.h		2017-12-29 15:16:14 -08:00
..
developer	Script that uses date, time and coordinates to compute sun position - this is then used to position the keylight.	2017-12-27 14:17:05 -08:00
modules
system	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2017-12-29 15:16:14 -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