Dante Ruiz 3f8ea4ac54 fixed merge conflict		2017-02-17 23:33:39 +00:00
..
external
i18n
icon
resources	fixed merge conflict	2017-02-17 23:33:39 +00:00
src	fixed merge conflict	2017-02-17 23:33:39 +00:00
ui
CMakeLists.txt
interface.exe.manifest