Ryan Huffman 47d82988db Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher		2019-10-16 22:37:47 -07:00
..
cmake	fixing last mac warning and taskbar icon for windows	2019-10-01 14:41:46 -07:00
deps/miniz	fixing last mac warning and taskbar icon for windows	2019-10-01 14:41:46 -07:00
resources	Update text in qt launcher	2019-10-16 22:29:55 -07:00
src	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-10-16 22:37:47 -07:00
CMakeLists.txt	Update qt launcher to use static run-time libraries on Windows	2019-10-15 14:42:12 -07:00