e22b331 Merge branch 'f23' into f22

Merged and Committed by dmaphy 7 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'f23' into f22
    
    * f23:
      Version of bundled Scintilla has changed as well: 3.5.6 -> 3.6.6
    
        
file modified
+5 -2