Nissim Hadar 7260b4ff7b Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # libraries/entities/src/EntityPropertyFlags.h		2017-12-29 15:16:14 -08:00
..
external
i18n
icon
resources	No idea...	2017-12-28 09:35:58 -08:00
src	Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3	2017-12-29 09:12:17 -08:00
ui
CMakeLists.txt	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
interface.exe.manifest