Merge branch 'scintilla-371'
commit1b43cff10f35b682f8afc0be0f0ee5ac31bfb9b5
authorSven Strickroth <email@cs-ware.de>
Sun, 4 Dec 2016 17:35:25 +0000 (4 18:35 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 4 Dec 2016 17:35:25 +0000 (4 18:35 +0100)
tree6e56143301be49815c96a9966186311243397c97
parentf438df8b4916f67f2265cf54727348d5a2c398cb
parentfc75ef5ab458bf98a4a499f18fe750cb1dd5e4f6
Merge branch 'scintilla-371'