diff options
| -rw-r--r-- | cocoa/ScintillaFramework/Info.plist | 4 | ||||
| -rw-r--r-- | doc/ScintillaDownload.html | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 5 | ||||
| -rw-r--r-- | doc/index.html | 7 | ||||
| -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, 19 insertions, 17 deletions
diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist index b072fbf96..28044da9f 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.1</string> + <string>4.1.2</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>4.1.1</string> + <string>4.1.2</string> <key>NSPrincipalClass</key> <string></string> </dict> diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index a6a768913..971aae2e0 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/scintilla411.zip"> + <font size="4"> <a href="https://www.scintilla.org/scintilla412.zip"> Windows</a> - <a href="https://www.scintilla.org/scintilla411.tgz"> + <a href="https://www.scintilla.org/scintilla412.tgz"> GTK+/Linux</a> </font> </td> @@ -42,7 +42,7 @@ containing very few restrictions. </p> <h3> - Release 4.1.1 + Release 4.1.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="https://www.scintilla.org/scintilla411.zip">zip format</a> (1600K) commonly used on Windows</li> - <li><a href="https://www.scintilla.org/scintilla411.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li> + <li><a href="https://www.scintilla.org/scintilla412.zip">zip format</a> (1600K) commonly used on Windows</li> + <li><a href="https://www.scintilla.org/scintilla412.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 2654c0619..236dbb107 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -552,7 +552,7 @@ </h3> <ul> <li> - Released 9 September 2018. + Released 2 October 2018. </li> <li> C++ lexer fixes evaluation of "#elif". @@ -562,7 +562,8 @@ Markdown lexer fixes highlighting of non-ASCII characters in links. </li> <li> - SciTE on Win32 makes Del key work again in find and replace strips. + SciTE on Win32 drops menukey feature, makes Del key work again in find and replace strips + and disables F5 while command running. <a href="https://sourceforge.net/p/scintilla/bugs/2044/">Bug #2044</a>. </li> </ul> diff --git a/doc/index.html b/doc/index.html index e6c6466b3..47dc10c15 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="20180909" /> + <meta name="Date.Modified" content="20181002" /> <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.1<br /> - Site last modified September 9 2018</font> + <font color="#FFCC99" size="3"> Release version 4.1.2<br /> + Site last modified October 2 2018</font> </td> <td width="20%"> @@ -72,6 +72,7 @@ </tr> </table> <ul id="versionlist"> + <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> <li>Version 4.1.0 adds experimental support for bidirectional text as used by Arabic and Hebrew on Win32 and Cocoa.</li> <li>Version 4.0.5 adds experimental support for documents larger than 2 GigaBytes.</li> diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index d619cc65e..1d1e5a61a 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.1 +VERSION = 4.1.2 win32 { QMAKE_CXXFLAGS += -std:c++latest diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 2384b5b13..6414cf75f 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.1 +VERSION = 4.1.2 win32 { QMAKE_CXXFLAGS += -std:c++latest diff --git a/version.txt b/version.txt index 617de7eae..ddabef86a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -411 +412 diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index 190b4b9d9..3f122ccce 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -4,8 +4,8 @@ #include <windows.h> -#define VERSION_SCINTILLA "4.1.1" -#define VERSION_WORDS 4, 1, 1, 0 +#define VERSION_SCINTILLA "4.1.2" +#define VERSION_WORDS 4, 1, 2, 0 VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION_WORDS |