Merge branch 'scintilla-365'
commit6b35a842ca374174ff540749bc342d07a503b678
authorSven Strickroth <email@cs-ware.de>
Thu, 5 May 2016 12:36:17 +0000 (5 14:36 +0200)
committerSven Strickroth <email@cs-ware.de>
Thu, 5 May 2016 12:36:17 +0000 (5 14:36 +0200)
treeeeb50b9fd7964b370f494c0ea859981957656eea
parent780fc39efaab2720c5023860d18180c3f2b020cc
parentf3fdea387b6e8cc04972502362068d2253faad39
Merge branch 'scintilla-365'