Sam Gondelman 36a74eaeee Merge branch 'master' into decals		2018-02-15 11:02:49 -08:00
..
resources	add alert for moved content settings	2018-02-14 16:31:28 -08:00
src	put back default values in settings response	2018-02-14 12:09:57 -08:00
CMakeLists.txt	wip live material swapping on model entities, model overlays, avatars,	2018-02-09 12:00:08 -08:00