Preparing for 4.1.6 release.

8 files changed, 17 insertions, 13 deletions

diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index 197b1d30a..7512a81a5 100644
--- a/cocoa/ScintillaFramework/Info.plist
+++ b/cocoa/ScintillaFramework/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.5</string>
+	<string>4.1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.1.5</string>
+	<string>4.1.6</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index fb6918aff..a0144bbdb 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla415.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla416.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla415.tgz">
+	<a href="https://www.scintilla.org/scintilla416.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.1.5
+       Release 4.1.6
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla415.zip">zip format</a> (1700K) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla415.tgz">tgz format</a> (1500K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla416.zip">zip format</a> (1700K) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla416.tgz">tgz format</a> (1500K) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 1ce3d8435..32dc31ff0 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -563,6 +563,9 @@
 	<li>
 	For Visual C++ 2019, /std:c++latest now includes some C++20 features so switch to /std:c++17.
 	</li>
+	<li>
+	SciTE supports editing files larger than 2 gigabytes.
+	</li>
  	<li>
 	Lexer added for X12.
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1280/">Feature #1280</a>.
diff --git a/doc/index.html b/doc/index.html
index f9626f08f..94b4b9775 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -56,7 +56,7 @@
           GTK, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 4.1.5<br />
+          <font color="#FFCC99" size="3"> Release version 4.1.6<br />
            Site last modified April 17 2019</font>
         </td>
         <td width="20%">
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.1.6 adds an X12 lexer and improves performance on huge files.</li>
       <li>Version 4.1.5 removes special handling of non-0 wParam to WM_PAINT on Win32 and changes
       clipboard operations on GTK to avoid flickering.</li>
       <li>Version 4.1.4 makes calltips work on Qt and adds a lexer for .NET's Common Intermediate Language CIL.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index e37ea52c7..3634e82a1 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.1.5
+VERSION = 4.1.6
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index ba121c8ec..1bb69a6df 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.1.5
+VERSION = 4.1.6
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 21c8d99fe..1c105f1a6 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-415
+416
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 8b9d53c9c..569571f1b 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "4.1.5"
-#define VERSION_WORDS 4, 1, 5, 0
+#define VERSION_SCINTILLA "4.1.6"
+#define VERSION_WORDS 4, 1, 6, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS