SamGondelman 06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2		2019-04-22 13:28:30 -07:00
..
compiledResources
external
i18n
icon
resources	fixed merge conflict	2019-04-17 10:16:39 -07:00
src	Merge remote-tracking branch 'upstream/master' into stencil2	2019-04-22 13:28:30 -07:00
ui
CMakeLists.txt
interface.exe.manifest