Ryan Huffman 4f0936d384 Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher		2019-10-09 17:00:43 -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 qt launcher messaging to reflect feedback	2019-10-09 17:00:34 -07:00
src	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-10-09 17:00:43 -07:00
CMakeLists.txt	Update qtlite on Windows	2019-10-09 09:00:55 -07:00