danteruiz a2729065d0 fix error		2019-10-02 16:02:09 -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	finish touch up of UI	2019-10-02 15:43:32 -07:00
src	fix error	2019-10-02 16:02:09 -07:00
CMakeLists.txt	fix merge conflicts	2019-10-02 15:58:23 -07:00