overte/cmake/installer
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
..
install-folder.rsrc add a folder with icon for DMG installer 2016-01-20 10:46:54 -08:00
installer-header.bmp Update installer/uninstall icons. 2020-06-07 17:15:11 -04:00
installer.ico Update installer/uninstall icons. 2020-06-07 17:15:11 -04:00
Thumbs.db lots 2016-03-31 09:21:08 -07:00
uninstaller-header.bmp Update installer/uninstall icons. 2020-06-07 17:15:11 -04:00