Nissim Hadar 8ee5f642a9 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h		2017-12-22 15:41:59 -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	Avoid potentially slow entity list refresh upon deleting entities	2017-11-07 18:10:10 +13:00
entityProperties.js	Radio buttons now work correctly.	2017-12-20 19:17:18 -08:00
eventBridgeLoader.js	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
gridControls.js	Addressed CR of 9684	2017-03-02 21:39:56 +02:00
jquery-2.1.4.min.js	refactor system html to split js/css	2016-08-09 15:23:31 -07:00
jsoneditor.min.js	new user data editor	2016-08-22 17:30:08 -07:00
keyboardControl.js	9461 Keyboard for create appear then disappears immediately (HMD)	2017-12-01 20:29:35 +03:00
list.min.js	refactor system html to split js/css	2016-08-09 15:23:31 -07:00
marketplacesInject.js	Commerce Data Tracking: Iteration 3 (Purchases)	2017-12-21 15:46:01 -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	refactor system html to split js/css	2016-08-09 15:23:31 -07:00