David Rowe 8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option ... # Conflicts: # plugins/openvr/src/ViveControllerManager.cpp		2020-07-11 08:14:13 +12:00
..
compiledResources
external
i18n
icon	Update interface and server-console icons.	2020-06-07 20:43:38 -04:00
resources	Merge branch 'master' into feature/eye-tracking-option	2020-07-11 08:14:13 +12:00
src	Merge pull request #505 from daleglass/increase_max_texture_size	2020-07-09 17:33:51 -04:00
ui
CMakeLists.txt	Update packaging parameters for Vircadia.	2020-06-01 22:48:38 -04:00
interface.entitlements
interface.exe.manifest