Alezia Kurdis 95562f7e23 Merged of "screenshare" and requested changes. ... 1- Update some tooltips (changed "Set the" for "The") for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611 2- Include merge for conflict (not detected by Github) for "screenshare" attribute		2020-05-07 22:46:35 -04:00
..
+android_interface	force LOD to be 20-20 on android, and force lodAngleDeg to 0.248	2019-10-09 14:04:44 -07:00
+android_questInterface	adding market place back to the default scripts	2019-02-25 14:05:54 -08:00
communityModules	Update FloofChat.js	2020-02-16 20:20:04 -05:00
developer	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-10-22 16:25:38 -07:00
modules	Fix linux specific script engine crash	2019-08-15 13:07:43 -07:00
simplifiedUI	Fix module check.	2020-02-25 18:08:07 -05:00
system	Merged of "screenshare" and requested changes.	2020-05-07 22:46:35 -04:00
tutorials	Eliminated some JavaScript warnings due to missing commas	2019-03-28 16:06:31 +02:00
defaultScripts.js	Add inspect.js to default scripts	2020-02-27 21:14:49 +13:00
simplifiedUIBootstrapper.js	Better logic in bootstrapper to not load alread running scripts	2019-07-10 13:23:50 -07:00