diff options
| -rw-r--r-- | doc/ScintillaDownload.html | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 2 | ||||
| -rw-r--r-- | doc/index.html | 12 | ||||
| -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 |
7 files changed, 15 insertions, 19 deletions
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index 3c96b3871..aa23c79a8 100644 --- a/doc/ScintillaDownload.html +++ b/doc/ScintillaDownload.html @@ -25,9 +25,9 @@ <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0"> <tr> <td> - <font size="4"> <a href="http://www.scintilla.org/scintilla357.zip"> + <font size="4"> <a href="http://www.scintilla.org/scintilla360.zip"> Windows</a> - <a href="http://www.scintilla.org/scintilla357.tgz"> + <a href="http://www.scintilla.org/scintilla360.tgz"> GTK+/Linux</a> </font> </td> @@ -41,7 +41,7 @@ containing very few restrictions. </p> <h3> - Release 3.5.7 + Release 3.6.0 </h3> <h4> Source Code @@ -49,8 +49,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/scintilla357.zip">zip format</a> (1500K) commonly used on Windows</li> - <li><a href="http://www.scintilla.org/scintilla357.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li> + <li><a href="http://www.scintilla.org/scintilla360.zip">zip format</a> (1500K) commonly used on Windows</li> + <li><a href="http://www.scintilla.org/scintilla360.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 4be7b5e1c..5b038b699 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -489,7 +489,7 @@ </h3> <ul> <li> - Released 20 June 2015. + Released 5 August 2015. </li> <li> External interfaces use the Sci_Position and Sci_PositionU typedefs instead of int and unsigned int diff --git a/doc/index.html b/doc/index.html index 80b45aabe..9548a01ad 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="20150620" /> + <meta name="Date.Modified" content="20150805" /> <style type="text/css"> #versionlist { margin: 0; @@ -55,8 +55,8 @@ GTK+, and OS X</font> </td> <td width="40%" align="right"> - <font color="#FFCC99" size="3"> Release version 3.5.7<br /> - Site last modified June 20 2015</font> + <font color="#FFCC99" size="3"> Release version 3.6.0<br /> + Site last modified August 5 2015</font> </td> <td width="20%"> @@ -71,16 +71,12 @@ </tr> </table> <ul id="versionlist"> + <li>Version 3.6.0 implements more multiple selection operations.</li> <li>Version 3.5.7 fixes a crash on Cocoa with drag and drop and adds commands to add the next or each occurrence of the main selection to the set of selections.</li> <li>Version 3.5.6 fixes a bug with undo on Cocoa that could lose data.</li> <li>Version 3.5.5 improves IME on Qt and fixes minor bugs.</li> <li>Version 3.5.4 improves indicators to be able to change appearance on mouse-over and to use a wide variety of colours together.</li> - <li>Version 3.5.3 removes support for Windows 95, 98, and ME.</li> - <li>Version 3.5.2 only supports 64-bit builds for OS X 10.7+ Cocoa. Provisional support of C++11 <regex>.</li> - <li>Version 3.5.1 fixes minor bugs and includes a lexer for BibTeX.</li> - <li>Version 3.5.0 can share space vertically so that extreme ascenders and descenders are not cut off. - Separate timers are used to minimize wake ups and thus power use.</li> </ul> <ul id="menu"> <li id="remote1"><a href="http://www.scintilla.org/SciTEImage.html">Screenshot</a></li> diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index c0c9f43d8..c6ae03b6b 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -11,7 +11,7 @@ TARGET = ScintillaEdit TEMPLATE = lib CONFIG += lib_bundle -VERSION = 3.5.7 +VERSION = 3.6.0 SOURCES += \ ScintillaEdit.cpp \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 52bda7345..c6de77433 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -11,7 +11,7 @@ TARGET = ScintillaEditBase TEMPLATE = lib CONFIG += lib_bundle -VERSION = 3.5.7 +VERSION = 3.6.0 SOURCES += \ PlatQt.cpp \ diff --git a/version.txt b/version.txt index 4adf98449..2921a1584 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -357 +360 diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index 810a1a3ca..5f3f09cd4 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -4,8 +4,8 @@ #include <windows.h> -#define VERSION_SCINTILLA "3.5.7" -#define VERSION_WORDS 3, 5, 7, 0 +#define VERSION_SCINTILLA "3.6.0" +#define VERSION_WORDS 3, 6, 0, 0 VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION_WORDS |