Thijs Wenker 656d96c725 Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml		2018-12-27 21:52:57 +01:00
..
compiledResources
external
i18n
icon
resources	Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager	2018-12-27 21:52:57 +01:00
src	- add jointIndexes to new	2018-12-27 21:47:10 +01:00
ui
CMakeLists.txt	Add model preparation step to ModelCache using new library model-baker	2018-12-11 11:15:54 -08:00
interface.exe.manifest