Seth Alves e8a62d2943 Merge pull request #12740 from druiz17/fix-scope ... Fix name conflict with c++ class and qml file(master)		2018-03-30 15:41:42 -07:00
..
compiledResources	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
external	GLAD polish	2018-01-14 00:10:05 -08:00
i18n
icon
resources	Merge pull request #12740 from druiz17/fix-scope	2018-03-30 15:41:42 -07:00
src	Merge pull request #12704 from ElderOrb/FB13057	2018-03-30 11:18:05 -07:00
ui
CMakeLists.txt	fix cmake changes for script copy for dev builds	2018-03-28 14:47:09 -07:00
interface.exe.manifest