Nissim Hadar b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/ShapeEntityItem.h # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h		2018-02-19 13:05:57 -08:00
..
css	merge from master	2018-02-13 13:58:39 -08:00
img
js	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-19 13:05:57 -08:00
ChatPage.html
EmoteApp.html	new icon and button layout	2018-01-19 16:00:08 -08:00
entityList.html
entityProperties.html	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-19 13:05:57 -08:00
gridControls.html
marketplaces.html	Moved Blocks to tablet app	2017-08-10 14:23:45 -07:00
SnapshotReview.html
users.html