Atlante45 f2bbb88405 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones ... Conflicts: domain-server/resources/describe-settings.json domain-server/resources/web/js/settings.js		2014-10-09 15:34:17 -07:00
..
bootbox.min.js	stub of domain-server choose domain handler	2014-09-30 09:31:04 -07:00
bootstrap.min.js	update to newer bootstrap, add stub of setup form	2014-09-24 13:56:15 -07:00
domain-server.js	add missing domain-server javascript file	2014-08-04 15:37:06 -07:00
form2js.min.js	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
jquery.min.js	rename jquery for easier updating in domain-server	2014-10-01 09:00:24 -07:00
settings.js	Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones	2014-10-09 15:34:17 -07:00
setup.js	initial use of a json file to describe setup options	2014-09-25 15:12:37 -07:00
sweet-alert.min.js	use sweet alert for nice error messages in domain-settings	2014-10-08 15:32:56 -07:00
tables.js	use underscorejs templating for queued assignments	2014-06-26 15:45:31 -07:00
underscore-min.js	update underscore to 1.7.0	2014-09-25 16:41:14 -07:00