amantley 425413419a fixed merge conflict in avatar.h		2019-02-15 08:26:54 -08:00
..
compiledResources
external
i18n
icon	New icons for interface and server-console	2019-01-11 14:50:13 -08:00
resources	fixed merge conflict in avatar.h	2019-02-15 08:26:54 -08:00
src	fixed merge conflict in avatar.h	2019-02-15 08:26:54 -08:00
ui
CMakeLists.txt	Merge pull request #14809 from highfidelity/commandLineAndroid	2019-02-14 12:10:08 -08:00
interface.exe.manifest