danteruiz 82faeb70c8 remove merge conflict comments		2019-09-19 10:40:16 -07:00
..
cmake	fix window cmake	2019-09-03 18:05:13 -07:00
deps/miniz	Add unzipper to qt launcher	2019-09-13 13:56:38 -07:00
resources	fix qml urls and text fields	2019-09-17 12:29:48 -07:00
src	remove merge conflict comments	2019-09-19 10:40:16 -07:00
CMakeLists.txt	launching interface for mac and windows	2019-09-17 14:13:48 -07:00