aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--LongTermDownload.html10
-rw-r--r--cocoa/ScintillaFramework/Info.plist4
-rw-r--r--doc/ScintillaDownload.html10
-rw-r--r--doc/ScintillaHistory.html11
-rw-r--r--doc/index.html2
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.pro2
-rw-r--r--version.txt2
-rw-r--r--win32/ScintRes.rc4
8 files changed, 27 insertions, 18 deletions
diff --git a/LongTermDownload.html b/LongTermDownload.html
index 251f61304..4658874c1 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.11.0/scintilla3110.zip/download">
+ <font size="4"> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.1/scintilla3111.zip/download">
Windows</a>&nbsp;&nbsp;
- <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.0/scintilla3110.tgz/download">
+ <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.1/scintilla3111.tgz/download">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -46,7 +46,7 @@
containing very few restrictions.
</p>
<h3>
- Release 3.11.0
+ Release 3.11.1
</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.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>
+ <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.1/scintilla3111.zip/download">zip format</a> commonly used on Windows</li>
+ <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.1/scintilla3111.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 f7808910e..6c2af0cfa 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.11.0</string>
+ <string>3.11.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>3.11.0</string>
+ <string>3.11.1</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index d8de5edd7..c77d0a978 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/scintilla3110.zip">
+ <font size="4"> <a href="https://www.scintilla.org/scintilla3111.zip">
Windows</a>&nbsp;&nbsp;
- <a href="https://www.scintilla.org/scintilla3110.tgz">
+ <a href="https://www.scintilla.org/scintilla3111.tgz">
GTK/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -42,7 +42,7 @@
containing very few restrictions.
</p>
<h3>
- Release 3.11.0
+ Release 3.11.1
</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/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>
+ <li><a href="https://www.scintilla.org/scintilla3111.zip">zip format</a> (1600K) commonly used on Windows</li>
+ <li><a href="https://www.scintilla.org/scintilla3111.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 dfe47f5f6..22c080131 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -551,7 +551,7 @@
</h3>
<ul>
<li>
- Released 30 Aug 2019.
+ Released 26 Oct 2019.
</li>
<li>
Add SCI_SETTABMINIMUMWIDTH to set the minimum width of tabs.
@@ -583,6 +583,15 @@
<a href="https://sourceforge.net/p/scintilla/feature-requests/1305/">Feature #1305</a>.
</li>
<li>
+ Updated C, Rust, Prolog, and Logtalk Lua LPeg lexers.
+ </li>
+ <li>
+ Added MediaWiki Lua LPeg lexer.
+ </li>
+ <li>
+ Prevent Lua LPeg lexers from double-counting fold points on a single line.
+ </li>
+ <li>
Updated case conversion and character categories to Unicode 12.1.
<a href="https://sourceforge.net/p/scintilla/feature-requests/1315/">Feature #1315</a>.
</li>
diff --git a/doc/index.html b/doc/index.html
index f8713a2b5..6878a8404 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.11.0<br />
+ <font color="#FFCC99" size="3"> Release version 3.11.1<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 42af752c8..f99ef57f1 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -20,7 +20,7 @@ unix {
}
}
-VERSION = 3.11.0
+VERSION = 3.11.1
SOURCES += \
ScintillaEdit.cpp \
diff --git a/version.txt b/version.txt
index 32c211cef..3c07cd068 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3110
+3111
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 53c2fa356..574996c0a 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
#include <windows.h>
-#define VERSION_SCINTILLA "3.11.0"
-#define VERSION_WORDS 3, 11, 0, 0
+#define VERSION_SCINTILLA "3.11.1"
+#define VERSION_WORDS 3, 11, 1, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS