Ryan Huffman 746a800f0f Merge branch 'qt-launcher' of https://github.com/danteruiz/hifi into qt-launcher		2019-10-15 14:42:58 -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	fix mac TextFields	2019-10-10 20:57:30 -07:00
src	mac suppress reset settings	2019-10-14 13:12:05 -07:00
CMakeLists.txt	Update qt launcher to use static run-time libraries on Windows	2019-10-15 14:42:12 -07:00