aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cocoa/ScintillaFramework/Info.plist4
-rw-r--r--doc/ScintillaDownload.html10
-rw-r--r--doc/ScintillaHistory.html2
-rw-r--r--doc/index.html10
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.pro2
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.pro2
-rw-r--r--version.txt2
-rw-r--r--win32/ScintRes.rc4
8 files changed, 17 insertions, 19 deletions
diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index fb32e6488..5d376541f 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.7</string>
+ <string>4.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>4.1.7</string>
+ <string>4.2.0</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 49a01366f..eea2aea62 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/scintilla417.zip">
+ <font size="4"> <a href="https://www.scintilla.org/scintilla420.zip">
Windows</a>&nbsp;&nbsp;
- <a href="https://www.scintilla.org/scintilla417.tgz">
+ <a href="https://www.scintilla.org/scintilla420.tgz">
GTK/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -42,7 +42,7 @@
containing very few restrictions.
</p>
<h3>
- Release 4.1.7
+ Release 4.2.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/scintilla417.zip">zip format</a> (1.7M) commonly used on Windows</li>
- <li><a href="https://www.scintilla.org/scintilla417.tgz">tgz format</a> (1.4M) commonly used on Linux and compatible operating systems</li>
+ <li><a href="https://www.scintilla.org/scintilla420.zip">zip format</a> (1.7M) commonly used on Windows</li>
+ <li><a href="https://www.scintilla.org/scintilla420.tgz">tgz format</a> (1.4M) 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 118859ac2..b67f3ab1d 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -561,7 +561,7 @@
</h3>
<ul>
<li>
- Released 13 June 2019.
+ Released 5 July 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 4f7946cb3..942032c54 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -9,7 +9,7 @@
<meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
<meta name="Description"
content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
- <meta name="Date.Modified" content="20190613" />
+ <meta name="Date.Modified" content="20190705" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
#versionlist {
@@ -56,8 +56,8 @@
GTK, and OS X</font>
</td>
<td width="40%" align="right">
- <font color="#FFCC99" size="3"> Release version 4.1.7<br />
- Site last modified June 13 2019</font>
+ <font color="#FFCC99" size="3"> Release version 4.2.0<br />
+ Site last modified July 5 2019</font>
</td>
<td width="20%">
&nbsp;
@@ -72,14 +72,12 @@
</tr>
</table>
<ul id="versionlist">
+ <li>Version 4.2.0 adds new types to Scintilla.iface.</li>
<li>Version 4.1.7 is just to match a bug-fix release of SciTE and changes nothing in Scintilla.</li>
<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>
- <li>Version 4.1.3 is compatible with macOS 10.14, improves performance, and adds a new lexer for Nim which will replace the "nimrod" lexer.</li>
- <li>Version 4.1.2 is a minor release.</li>
- <li>Version 4.1.1 adds optional indexing of line starts in UTF-8 documents by UTF-32 code points and UTF-16 code units.</li>
</ul>
<ul id="menu">
<li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index dea8ce540..d5416de37 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.7
+VERSION = 4.2.0
SOURCES += \
ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 0eb6588a3..a8eddfe02 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.7
+VERSION = 4.2.0
SOURCES += \
PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 53c86ff4f..816d01be5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-417
+420
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 62e38a5f4..6772232b9 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
#include <windows.h>
-#define VERSION_SCINTILLA "4.1.7"
-#define VERSION_WORDS 4, 1, 7, 0
+#define VERSION_SCINTILLA "4.2.0"
+#define VERSION_WORDS 4, 2, 0, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS