David Rowe 7445d73857 Merge branch 'master' into M21222 ... # Conflicts: # libraries/avatars/src/AvatarData.h		2019-03-13 16:14:14 +13:00
..
compiledResources
external
i18n
icon	New icons for interface and server-console	2019-01-11 14:50:13 -08:00
resources	Merge pull request #15151 from roxanneskelly/Case20622	2019-03-12 17:42:47 -07:00
src	Merge branch 'master' into M21222	2019-03-13 16:14:14 +13:00
ui
CMakeLists.txt	Merge pull request #14905 from SamGondelman/materialMapping	2019-02-15 11:21:51 -08:00
interface.exe.manifest