diff options
| -rw-r--r-- | cocoa/ScintillaFramework/Info.plist | 4 | ||||
| -rw-r--r-- | doc/ScintillaDownload.html | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 2 | ||||
| -rw-r--r-- | doc/index.html | 10 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.pro | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 2 | ||||
| -rw-r--r-- | version.txt | 2 | ||||
| -rw-r--r-- | win32/ScintRes.rc | 4 |
8 files changed, 17 insertions, 19 deletions
diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist index 5d376541f..a510ccaf7 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.2.0</string> + <string>4.2.1</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>4.2.0</string> + <string>4.2.1</string> <key>NSPrincipalClass</key> <string></string> </dict> diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index eea2aea62..14ded6e32 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/scintilla420.zip"> + <font size="4"> <a href="https://www.scintilla.org/scintilla421.zip"> Windows</a> - <a href="https://www.scintilla.org/scintilla420.tgz"> + <a href="https://www.scintilla.org/scintilla421.tgz"> GTK/Linux</a> </font> </td> @@ -42,7 +42,7 @@ containing very few restrictions. </p> <h3> - Release 4.2.0 + Release 4.2.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/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> + <li><a href="https://www.scintilla.org/scintilla421.zip">zip format</a> (1.7M) commonly used on Windows</li> + <li><a href="https://www.scintilla.org/scintilla421.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 6f823d593..241d1a6bd 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -562,7 +562,7 @@ </h3> <ul> <li> - Released 5 July 2019. + Released 24 October 2019. </li> <li> Add SCI_SETTABMINIMUMWIDTH to set the minimum width of tabs. diff --git a/doc/index.html b/doc/index.html index 942032c54..260e3443e 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="20190705" /> + <meta name="Date.Modified" content="20191024" /> <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.2.0<br /> - Site last modified July 5 2019</font> + <font color="#FFCC99" size="3"> Release version 4.2.1<br /> + Site last modified October 24 2019</font> </td> <td width="20%"> @@ -72,12 +72,10 @@ </tr> </table> <ul id="versionlist"> + <li>Version 4.2.1 allows miniaturized views to layout like normal size views.</li> <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> </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 d5416de37..c218115c9 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.2.0 +VERSION = 4.2.1 SOURCES += \ ScintillaEdit.cpp \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index a8eddfe02..4441319d5 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.2.0 +VERSION = 4.2.1 SOURCES += \ PlatQt.cpp \ diff --git a/version.txt b/version.txt index 816d01be5..1bb7ac539 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -420 +421 diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index 6772232b9..d0e64d23e 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -4,8 +4,8 @@ #include <windows.h> -#define VERSION_SCINTILLA "4.2.0" -#define VERSION_WORDS 4, 2, 0, 0 +#define VERSION_SCINTILLA "4.2.1" +#define VERSION_WORDS 4, 2, 1, 0 VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION_WORDS |