@getzze pushed 4 commits.
6400fe99fc439a48001b614bc27d2109e772f102 correct scintilla warnings 613d38bad18b36f6bbb2267642b40b2dcfabeb0e merge conflict 8f9e59f14786d2ef5c135b768b18092c8edf2125 merge conflict 31bede9a57915916e1066d380925f0fef3677680 merge conflict