Thijs Wenker c95da0a595 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/src/Application.cpp		2019-01-03 22:17:54 +01:00
..
src	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-03 22:17:54 +01:00
CMakeLists.txt	wip live material swapping on model entities, model overlays, avatars,	2018-02-09 12:00:08 -08:00