luiscuenca 624a53449f Merge branch 'master' into flowCpp ... # Solved Conflicts: # interface/src/avatar/MyAvatar.cpp		2019-02-14 18:55:43 -07:00
..
compiledResources
external
i18n
icon
resources	Merge pull request #14782 from SamGondelman/NOverlaysFinal	2019-02-14 13:49:47 -08:00
src	Merge branch 'master' into flowCpp	2019-02-14 18:55:43 -07:00
ui
CMakeLists.txt	Merge pull request #14809 from highfidelity/commandLineAndroid	2019-02-14 12:10:08 -08:00
interface.exe.manifest