amantley 4b1f974561 fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h		2018-03-28 11:57:48 -07:00
..
compiledResources
external
i18n
icon
resources	Merge pull request #12721 from highfidelity/RC66	2018-03-28 09:55:46 -07:00
src	fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h	2018-03-28 11:57:48 -07:00
ui
CMakeLists.txt	Fix serverless content not using correct directories	2018-03-26 14:32:52 -07:00
interface.exe.manifest