Nissim Hadar ff43e4c2ad Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # scripts/system/html/js/entityProperties.js		2018-02-15 11:53:11 -08:00
..
colpick.js	Protect stroke width from wrong user input. Protect color pick from wrong user input.	2017-09-21 15:54:53 +01:00
entityList.js	new local reference to image model	2018-02-02 10:27:44 -08:00
entityProperties.js	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-15 11:53:11 -08:00
eventBridgeLoader.js
gridControls.js
jquery-2.1.4.min.js
jsoneditor.min.js
keyboardControl.js	9461 Keyboard for create appear then disappears immediately (HMD)	2017-12-01 20:29:35 +03:00
list.min.js
marketplacesInject.js	Make things slightly better?	2018-01-02 13:11:00 -08:00
SnapshotReview.js	Tweak the Snapshot 'Share' button to make its purpose more clear	2017-07-05 12:39:15 -07:00
spinButtons.js