David Rowe a782b6779a Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h		2018-02-28 12:42:05 +13:00
..
debugging	Remove unused Overlays property, borderSize, and associated code	2018-02-04 14:54:14 +13:00
libraries	Merge branch 'master' into 21190-fix-unit-tests	2017-04-10 14:15:47 -04:00
tests	Merge branch 'master' into 21709	2018-02-28 12:42:05 +13:00
utilities	Merge pull request #12346 from Zvork/scripts	2018-02-13 09:08:35 -08:00
EZrecord.js	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
hmdRollControlDisable.js	Disable print statements	2017-06-14 15:37:36 +12:00
hmdRollControlEnable.js	Rename identifiers	2017-06-15 09:20:55 +12:00
inputRecording.js	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
sunModel.js	Added user data for lat/lon.	2018-01-08 11:50:49 -08:00