vladest 4c1bbdacec Fix merge conflicts		2017-11-13 16:45:10 +01:00
..
external
i18n
icon
resources	Fix merge conflicts	2017-11-13 16:45:10 +01:00
src	Merge pull request #11650 from Zvork/outline	2017-11-10 15:45:03 -08:00
ui
CMakeLists.txt
interface.exe.manifest