diff options
| -rw-r--r-- | doc/ScintillaDownload.html | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 9 | ||||
| -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 |
7 files changed, 20 insertions, 16 deletions
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index 73b5384c7..7bcb01c54 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://prdownloads.sourceforge.net/scintilla/scintilla355.zip?download"> + <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla356.zip?download"> Windows</a> - <a href="http://prdownloads.sourceforge.net/scintilla/scintilla355.tgz?download"> + <a href="http://prdownloads.sourceforge.net/scintilla/scintilla356.tgz?download"> GTK+/Linux</a> </font> </td> @@ -41,7 +41,7 @@ containing very few restrictions. </p> <h3> - Release 3.5.5 + Release 3.5.6 </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://prdownloads.sourceforge.net/scintilla/scintilla355.zip?download">zip format</a> (1450K) commonly used on Windows</li> - <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla355.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li> + <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla356.zip?download">zip format</a> (1450K) commonly used on Windows</li> + <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla356.tgz?download">tgz format</a> (1300K) 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 10ec216f9..07cf6093e 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -484,11 +484,11 @@ </li> </ul> <h3> - <a href="http://prdownloads.sourceforge.net/scintilla/scite355.zip?download">Release 3.5.5</a> + <a href="http://prdownloads.sourceforge.net/scintilla/scite356.zip?download">Release 3.5.6</a> </h3> <ul> <li> - Released 17 April 2015. + Released 26 May 2015. </li> <li> On Qt, use fractional positioning calls and avoid rounding to ensure consistency. @@ -528,6 +528,9 @@ <a href="http://sourceforge.net/p/scintilla/bugs/1710/">Bug #1710</a>. </li> <li> + Fix undo bug on Cocoa that could lose data.. + </li> + <li> Fix link error on Windows when SCI_NAMESPACE used. </li> <li> @@ -541,7 +544,7 @@ SciTE on GTK+ 3.x disables arrow in search combo when no entries. <a href="http://sourceforge.net/p/scintilla/bugs/1717/">Bug #1717</a>. </li> - <ul> + </ul> <h3> <a href="http://prdownloads.sourceforge.net/scintilla/scite355.zip?download">Release 3.5.5</a> </h3> diff --git a/doc/index.html b/doc/index.html index 1db8b4816..41cc6b8b9 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="20150417" /> + <meta name="Date.Modified" content="20150526" /> <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.5<br /> - Site last modified April 17 2015</font> + <font color="#FFCC99" size="3"> Release version 3.5.6<br /> + Site last modified May 26 2015</font> </td> <td width="20%"> @@ -71,6 +71,7 @@ </tr> </table> <ul id="versionlist"> + <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> diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index 2c5e24517..1fe61cffb 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.5 +VERSION = 3.5.6 SOURCES += \ ScintillaEdit.cpp \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 6bcc40edb..93dda6e79 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.5 +VERSION = 3.5.6 SOURCES += \ PlatQt.cpp \ diff --git a/version.txt b/version.txt index 8941db590..53d5a5ad6 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -355 +356 diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index ff070684d..3e4a0563b 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -4,8 +4,8 @@ #include <windows.h> -#define VERSION_SCINTILLA "3.5.5" -#define VERSION_WORDS 3, 5, 5, 0 +#define VERSION_SCINTILLA "3.5.6" +#define VERSION_WORDS 3, 5, 6, 0 VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION_WORDS |