David Rowe e879c5a32d Merge branch 'master' into M19085 ... # Conflicts: # interface/src/avatar/AvatarManager.h		2018-10-24 12:16:38 +13:00
..
compiledResources
external
i18n
icon
resources	Merge pull request #14126 from amantley/squattyPottyFix	2018-10-23 15:20:49 -07:00
src	Merge branch 'master' into M19085	2018-10-24 12:16:38 +13:00
ui
CMakeLists.txt
interface.exe.manifest