Preparing for 3.11.0 release.rel-3-11-0

9 files changed, 20 insertions, 20 deletions

diff --git a/LongTermDownload.html b/LongTermDownload.html
index dc3980641..251f61304 100644
--- a/LongTermDownload.html
+++ b/LongTermDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.6/scintilla3106.zip/download">
+          <font size="4"> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.0/scintilla3110.zip/download">
   Windows</a>&nbsp;&nbsp;
-  <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.6/scintilla3106.tgz/download">
+  <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.0/scintilla3110.tgz/download">
           GTK+/Linux</a>&nbsp;&nbsp;
   </font>
         </td>
@@ -46,7 +46,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.10.6
+       Release 3.11.0
     </h3>
     <h4>
        Source Code
@@ -54,8 +54,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://sourceforge.net/projects/scintilla/files/scintilla/3.10.6/scintilla3106.zip/download">zip format</a> commonly used on Windows</li>
-       <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.6/scintilla3106.tgz/download">tgz format</a> commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.0/scintilla3110.zip/download">zip format</a> commonly used on Windows</li>
+       <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.0/scintilla3110.tgz/download">tgz format</a> commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <p>
diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index bece06b2c..f7808910e 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>3.10.6</string>
+	<string>3.11.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.10.6</string>
+	<string>3.11.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 7f43f7150..d8de5edd7 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/scintilla3106.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla3110.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla3106.tgz">
+	<a href="https://www.scintilla.org/scintilla3110.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.10.6
+       Release 3.11.0
     </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/scintilla3106.zip">zip format</a> (1600K) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla3106.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla3110.zip">zip format</a> (1600K) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla3110.tgz">tgz format</a> (1400K) 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 0a5add100..81134127c 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -546,11 +546,11 @@
       </li>
     </ul>
     <h3>
-       <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.7/scintilla3107.zip/download">Release 3.10.7</a>
+       <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.0/scintilla3110.zip/download">Release 3.11.0</a>
     </h3>
     <ul>
 	<li>
-	Released 11 Jun 2019.
+	Released 30 Aug 2019.
 	</li>
  	<li>
 	Scintilla.iface adds line and pointer types, increases use of the position type, uses enumeration
diff --git a/doc/index.html b/doc/index.html
index cf0177eaf..f8713a2b5 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 3.10.6<br />
+          <font color="#FFCC99" size="3"> Release version 3.11.0<br />
            Site last modified February 12 2018</font>
         </td>
         <td width="20%">
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 9042ce147..42af752c8 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -20,7 +20,7 @@ unix {
     }
 }
 
-VERSION = 3.10.6
+VERSION = 3.11.0
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 0308816a9..de33a138a 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -19,7 +19,7 @@ unix {
     }
 }
 
-VERSION = 3.10.6
+VERSION = 3.11.0
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 4253b0514..32c211cef 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3106
+3110
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index aee0f0599..53c2fa356 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.10.6"
-#define VERSION_WORDS 3, 10, 6, 0
+#define VERSION_SCINTILLA "3.11.0"
+#define VERSION_WORDS 3, 11, 0, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS