motofckr9k 3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' ... Conflicts: BUILD_WIN.md CODING_STANDARD.md LICENSE cmake/installer/installer-header.bmp cmake/installer/installer.ico cmake/installer/uninstaller-header.bmp interface/resources/images/about-vircadia.png interface/resources/images/vircadia-logo.svg interface/resources/qml/LoginDialog.qml interface/resources/qml/dialogs/TabletLoginDialog.qml interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml interface/src/Application.cpp pkg-scripts/athena-server.spec scripts/system/more/app-more.js scripts/system/more/css/styles.css scripts/system/more/more.html		2020-06-10 02:49:13 +02: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	remove old/unused eyetracker code	2019-09-17 09:43:32 -07:00
ports	Use newer opus to fix illegal instruction in libopusCodec.so	2020-06-07 12:51:38 +02:00
templates	Update packaging parameters for Vircadia.	2020-06-01 22:48:38 -04:00
compiler.cmake	Allow a user to limit the number of cores used when building	2019-08-26 11:51:42 -07:00
init.cmake	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00