David Rowe e3b9d588ec Merge branch 'master' into 21235 ... # Conflicts: # interface/src/Menu.cpp # interface/src/ui/DialogsManager.h		2017-03-18 09:42:36 +13:00
..
external
i18n
icon
resources	Merge pull request #9858 from kunalgosar/logBolding	2017-03-16 13:09:37 -07:00
src	Merge branch 'master' into 21235	2017-03-18 09:42:36 +13: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