Commit graph

4 commits

Author SHA1 Message Date
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
Thijs Wenker
ecc578c2dd - error messages
- style changes
2019-01-03 22:00:22 +01:00
Ryan Huffman
c13badcbc8 Fix project rename focus and create project not initializing 2019-01-03 10:20:13 -08:00
Ryan Huffman
89b03a3cdc Add info popup box for avatar project files 2018-12-27 14:30:44 -08:00