Merge branch 'scintilla-update-342'
commite566435dfae4e410f65efbb463f682221788354c
authorColomban Wendling <ban@herbesfolles.org>
Sat, 17 May 2014 20:23:43 +0000 (17 22:23 +0200)
committerColomban Wendling <ban@herbesfolles.org>
Sat, 17 May 2014 20:23:43 +0000 (17 22:23 +0200)
treeefafd726625704b3be0f88b5757cbc3e4e954a03
parentf3d96ef91db976a81b48f34a37ffd7c856dc7527
parent67329f2b9860a970cf9afe6bf85b25ef7402df6e
Merge branch 'scintilla-update-342'

This fixes flickering under GTK >= 3.10.