aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2017-10-26 17:28:57 +1100
committerNeil <nyamatongwe@gmail.com>2017-10-26 17:28:57 +1100
commit37e9346e22946868c9e0ea345559f5e99b8ab188 (patch)
tree94d45edacc4c4d5cc0d36b9d6baf5bc8f780551c
parent5d584e7e38daaf44c54d458e3bf845ff2bbe6a21 (diff)
downloadscintilla-mirror-37e9346e22946868c9e0ea345559f5e99b8ab188.tar.gz
Updates for 4.0.2.rel-4-0-2
-rw-r--r--cocoa/ScintillaFramework/Info.plist4
-rw-r--r--doc/ScintillaDownload.html10
-rw-r--r--doc/ScintillaHistory.html2
-rw-r--r--doc/index.html7
-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, 16 deletions
diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index 1309fee0d..a2355d284 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.0.1</string>
+ <string>4.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>4.0.1</string>
+ <string>4.0.2</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index decaa4933..c5a126b65 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="http://www.scintilla.org/scintilla401.zip">
+ <font size="4"> <a href="http://www.scintilla.org/scintilla402.zip">
Windows</a>&nbsp;&nbsp;
- <a href="http://www.scintilla.org/scintilla401.tgz">
+ <a href="http://www.scintilla.org/scintilla402.tgz">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -42,7 +42,7 @@
containing very few restrictions.
</p>
<h3>
- Release 4.0.1
+ Release 4.0.2
</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="http://www.scintilla.org/scintilla401.zip">zip format</a> (1600K) commonly used on Windows</li>
- <li><a href="http://www.scintilla.org/scintilla401.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+ <li><a href="http://www.scintilla.org/scintilla402.zip">zip format</a> (1600K) commonly used on Windows</li>
+ <li><a href="http://www.scintilla.org/scintilla402.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 3a06b1e7c..051baf916 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -531,7 +531,7 @@
</h3>
<ul>
<li>
- Released 23 October 2017.
+ Released 26 October 2017.
</li>
<li>
Fix HTML lexer handling of Django so that nesting a &#123;&#123; &#125;&#125; or &#123;% %&#125;
diff --git a/doc/index.html b/doc/index.html
index 35481e60b..af84d41bf 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="20171023" />
+ <meta name="Date.Modified" content="20171026" />
<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.0.1<br />
- Site last modified October 23 2017</font>
+ <font color="#FFCC99" size="3"> Release version 4.0.2<br />
+ Site last modified October 26 2017</font>
</td>
<td width="20%">
&nbsp;
@@ -72,6 +72,7 @@
</tr>
</table>
<ul id="versionlist">
+ <li>Version 4.0.2 fixes some bugs on macOS 10.13.</li>
<li>Version 4.0.1 makes some changes to namespaces and headers. Scrolling is smoother on Cocoa.</li>
<li>Version 4.0.0 is an unstable major release with changes to some internal and external interfaces.</li>
<li>Version 3.7.6 was a minor long term release.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 95e8ee4c1..7fec6e353 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
CONFIG += lib_bundle
CONFIG += c++14
-VERSION = 4.0.1
+VERSION = 4.0.2
win32 {
QMAKE_CXXFLAGS += -std:c++latest
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 21acd7124..987783dc1 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
CONFIG += lib_bundle
CONFIG += c++14
-VERSION = 4.0.1
+VERSION = 4.0.2
win32 {
QMAKE_CXXFLAGS += -std:c++latest
diff --git a/version.txt b/version.txt
index 066cbfe90..52f22458d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-401
+402
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 0cc806906..d70ec8b24 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
#include <windows.h>
-#define VERSION_SCINTILLA "4.0.1"
-#define VERSION_WORDS 4, 0, 1, 0
+#define VERSION_SCINTILLA "4.0.2"
+#define VERSION_WORDS 4, 0, 2, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS