Merge branch 'scintilla-372'
commitb284f4a575d6648e4e643bb5c366de4923d30712
authorSven Strickroth <email@cs-ware.de>
Fri, 30 Dec 2016 10:55:26 +0000 (30 11:55 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 30 Dec 2016 10:55:26 +0000 (30 11:55 +0100)
tree005608a7f452314a13fa9d02e800213b0e813b05
parentd1941ac73fad80a90329318b804981b6db526764
parentfc1db25adcf9c940a8da3039349439150b0b24c3
Merge branch 'scintilla-372'