aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2015-04-14 13:21:38 +1000
committerNeil <nyamatongwe@gmail.com>2015-04-14 13:21:38 +1000
commit3ccd8a1b4ed5e144e14f484d139324f0f173ec41 (patch)
tree930a884380387a75b86262d1b3662e564b9c66ab
parent1197075ff12ff8dbd1f4e87a58d8bd70b806e99f (diff)
downloadscintilla-mirror-3ccd8a1b4ed5e144e14f484d139324f0f173ec41.tar.gz
Getting ready for 3.5.5 release.
-rw-r--r--doc/ScintillaDownload.html10
-rw-r--r--doc/ScintillaHistory.html4
-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
7 files changed, 16 insertions, 15 deletions
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index c26f7a343..73b5384c7 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/scintilla354.zip?download">
+ <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla355.zip?download">
Windows</a>&nbsp;&nbsp;
- <a href="http://prdownloads.sourceforge.net/scintilla/scintilla354.tgz?download">
+ <a href="http://prdownloads.sourceforge.net/scintilla/scintilla355.tgz?download">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -41,7 +41,7 @@
containing very few restrictions.
</p>
<h3>
- Release 3.5.4
+ Release 3.5.5
</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/scintilla354.zip?download">zip format</a> (1450K) commonly used on Windows</li>
- <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla354.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
+ <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>
</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 49de6dc2c..c6080f8c9 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -481,11 +481,11 @@
</li>
</ul>
<h3>
- <a href="http://prdownloads.sourceforge.net/scintilla/scite354.zip?download">Release 3.5.4</a>
+ <a href="http://prdownloads.sourceforge.net/scintilla/scite355.zip?download">Release 3.5.5</a>
</h3>
<ul>
<li>
- Released 8 March 2015.
+ Released 17 April 2015.
</li>
<li>
Scintilla on Windows is now always a wide character window so SCI_SETKEYSUNICODE has no effect
diff --git a/doc/index.html b/doc/index.html
index f1010a846..c656a3d4f 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="20150308" />
+ <meta name="Date.Modified" content="20150417" />
<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.4<br />
- Site last modified March 8 2015</font>
+ <font color="#FFCC99" size="3"> Release version 3.5.5<br />
+ Site last modified April 17 2015</font>
</td>
<td width="20%">
&nbsp;
@@ -71,6 +71,7 @@
</tr>
</table>
<ul id="versionlist">
+ <li>Version 3.5.5 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 &lt;regex&gt;.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 02dbb042b..2c5e24517 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.4
+VERSION = 3.5.5
SOURCES += \
ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index fc92b3c5d..6bcc40edb 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.4
+VERSION = 3.5.5
SOURCES += \
PlatQt.cpp \
diff --git a/version.txt b/version.txt
index bc23f8ef5..8941db590 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-354
+355
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 3337f8231..ff070684d 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
#include <windows.h>
-#define VERSION_SCINTILLA "3.5.4"
-#define VERSION_WORDS 3, 5, 4, 0
+#define VERSION_SCINTILLA "3.5.5"
+#define VERSION_WORDS 3, 5, 5, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS