Merge branch 'scintilla-3.6.3'
commit07135763b442d2ce4304a140cd6b89336dcc1f4b
authorSven Strickroth <email@cs-ware.de>
Wed, 20 Jan 2016 22:31:36 +0000 (20 23:31 +0100)
committerSven Strickroth <email@cs-ware.de>
Wed, 20 Jan 2016 22:33:06 +0000 (20 23:33 +0100)
tree2aa72f48d6463fa98a0fb565e23c6a5ea3740903
parentfcfda4e55fdd480c862a07be8b7e6542003f7a99
parent524185593808906f9a5b125daf5c056441248a3a
Merge branch 'scintilla-3.6.3'

Signed-off-by: Sven Strickroth <email@cs-ware.de>