John Conklin II e0a11271bf Merge pull request #12573 from birarda/bug/domain-settings-metaverse ... fix for getSetting QVariant ref in DomainServer		2018-03-07 12:11:45 -08:00
..
resources	fixes for comments from code reviews	2018-02-26 14:35:34 -08:00
src	Merge pull request #12573 from birarda/bug/domain-settings-metaverse	2018-03-07 12:11:45 -08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration	2018-02-22 19:45:43 -08:00