Thijs Wenker 68521e11a7 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml # interface/resources/qml/hifi/avatarPackager/InfoBox.qml		2019-01-03 22:13:04 +01:00
..
compiledResources
external
i18n
icon
resources	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 22:13:04 +01:00
src	- error messages	2019-01-03 22:00:22 +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