amantley 47110d080f removed clang induced changes to MyAvatar.cpp		2018-07-02 17:06:16 -07:00
..
compiledResources	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
external	GLAD polish	2018-01-14 00:10:05 -08:00
i18n
icon
resources	fixing merge conflict	2018-07-02 15:54:21 -07:00
src	removed clang induced changes to MyAvatar.cpp	2018-07-02 17:06:16 -07:00
ui
CMakeLists.txt	merge 'master' into 'workload'	2018-06-18 13:40:08 -07:00
interface.exe.manifest