Nissim Hadar 34aab4a9c8 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/entities-renderer/src/RenderableZoneEntityItem.cpp		2018-02-12 17:50:39 -08:00
..
res/fonts
src	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-12 17:50:39 -08:00
CMakeLists.txt	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -08:00