Merge branch 'scintilla-405'
commitff0ac349860a302c67a9e7b6e9b61cabf7f17920
authorSven Strickroth <email@cs-ware.de>
Tue, 15 May 2018 18:56:18 +0000 (15 20:56 +0200)
committerSven Strickroth <email@cs-ware.de>
Tue, 15 May 2018 18:56:18 +0000 (15 20:56 +0200)
tree971240a8a1f8a63a2b6140d16b25cd331ad34e13
parente5820cb56a0a0367b9db725c4ab7d6ee42f9b5a6
parent6e66f5320e1e1e22a3dade96206db0778e3b4424
Merge branch 'scintilla-405'