Merge branch 'scintilla-374'
treeaf1fa8e7f3e8834eaa6788bd00a88edbb64273e6
-rw-r--r-- 600 .gitignore
-rw-r--r-- 975 .gitmodules
-rw-r--r-- 639 .mailmap
-rw-r--r-- 231 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 3974 README.md
-rw-r--r-- 3119 appveyor.yml
-rw-r--r-- 6137 architecture.txt
-rw-r--r-- 3273 build.txt
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 1261 release.txt
drwxr-xr-x - src
drwxr-xr-x - test