Merge branch 'scintilla-update'
commita3b4fec010d4c2fd8c1105cadcc87143880e258e
authorSven Strickroth <email@cs-ware.de>
Fri, 1 Jun 2012 17:03:55 +0000 (1 19:03 +0200)
committerSven Strickroth <email@cs-ware.de>
Fri, 1 Jun 2012 17:03:55 +0000 (1 19:03 +0200)
tree14a7ed02dfbac7130c95c1e8dcda1d90c2440d4d
parentea89626384633167f4f715f7bf712cd72063511d
parent06e90a488e2be98e72db7e06c32b38a1ded4aa90
Merge branch 'scintilla-update'

(fixes issue #1157)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt