Anthony J. Thibault d8f04d90a7 Merge branch 'master' into feature/can-touch-this		2017-03-09 14:24:10 -08:00
..
external
i18n
icon
resources	fix broken merge	2017-03-07 12:10:52 -08:00
src	Merge branch 'master' into feature/can-touch-this	2017-03-09 14:24:10 -08:00
ui
CMakeLists.txt	Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination	2017-03-07 10:11:09 +01:00
interface.exe.manifest