overte-lubosz/cmake
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
..
externals Fix files not removed in master merge 2020-04-11 15:40:11 +12:00
installer Merge remote-tracking branch 'refs/remotes/kasen/master' 2020-06-10 02:49:13 +02:00
macros Update packaging parameters for Vircadia. 2020-06-01 22:48:38 -04:00
modules
ports Merge branch 'master' into feature/eye-tracking-option 2020-07-11 08:14:13 +12:00
templates Update packaging parameters for Vircadia. 2020-06-01 22:48:38 -04:00
compiler.cmake
init.cmake