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
..
AvatarPackagerApp.qml	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 22:13:04 +01:00
AvatarPackagerFooter.qml	- error messages	2019-01-03 22:00:22 +01:00
AvatarPackagerHeader.qml	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 22:13:04 +01:00
AvatarPackagerState.qml	- rename functionality	2018-12-29 03:31:56 +01:00
AvatarProject.qml	- error messages	2019-01-03 22:00:22 +01:00
AvatarProjectCard.qml	Update various styling in Avatar Packager	2019-01-02 16:47:09 -08:00
AvatarProjectUpload.qml	- error messages	2019-01-03 22:00:22 +01:00
AvatarUploadStatusItem.qml	- rename functionality	2018-12-29 03:31:56 +01:00
ClickableArea.qml	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 22:13:04 +01:00
CreateAvatarProject.qml	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 22:13:04 +01:00
InfoBox.qml	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 22:13:04 +01:00
LoadingCircle.qml	Update icons in avatar packager	2018-12-27 12:43:43 -08:00
ProjectInputControl.qml	- rename functionality	2018-12-29 03:31:56 +01:00
qmldir	- fst read/write should work	2018-12-21 19:34:54 +01:00
RalewayButton.qml	Fix project rename focus and create project not initializing	2019-01-03 10:20:13 -08:00
Style.qml	Update avatar project styling	2018-12-22 21:57:09 -08:00