overte-AleziaKurdis/interface
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
..
compiledResources
external remove old/unused eyetracker code 2019-09-17 09:43:32 -07:00
i18n
icon Update interface and server-console icons. 2020-06-07 20:43:38 -04:00
resources Merge remote-tracking branch 'refs/remotes/kasen/master' 2020-06-10 02:49:13 +02:00
src Merge remote-tracking branch 'refs/remotes/kasen/master' 2020-06-10 02:49:13 +02:00
ui Specified color on text edit for console 2019-10-29 15:46:16 -07:00
CMakeLists.txt Update packaging parameters for Vircadia. 2020-06-01 22:48:38 -04:00
interface.entitlements Add entitlements for Launcher and Interface 2019-09-06 11:20:16 -07:00
interface.exe.manifest