Merge branch 'scintilla/gtk-3-20' into gtk-3-20-fixes
commit75063e9159bbc582e4d41b91bc187a040021e6d5
authorColomban Wendling <ban@herbesfolles.org>
Mon, 2 May 2016 13:26:39 +0000 (2 15:26 +0200)
committerColomban Wendling <ban@herbesfolles.org>
Mon, 2 May 2016 13:26:39 +0000 (2 15:26 +0200)
treeef17a32d96b3fb556389576335877ef0c3cdf1e1
parentc4f56bfcd6a16d8c04ad86fb50ed9f77107cb550
parentbf3140004d1618e0ae5fad1595aadf6835a97551
Merge branch 'scintilla/gtk-3-20' into gtk-3-20-fixes