aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaDownload.html10
-rw-r--r--doc/ScintillaHistory.html2
-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, 15 insertions, 14 deletions
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 0fb2b1516..b5de11d37 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/scintilla335.zip?download">
+ <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla336.zip?download">
Windows</a>&nbsp;&nbsp;
- <a href="http://prdownloads.sourceforge.net/scintilla/scintilla335.tgz?download">
+ <a href="http://prdownloads.sourceforge.net/scintilla/scintilla336.tgz?download">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -41,7 +41,7 @@
containing very few restrictions.
</p>
<h3>
- Release 3.3.5
+ Release 3.3.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/scintilla335.zip?download">zip format</a> (1250K) commonly used on Windows</li>
- <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla335.tgz?download">tgz format</a> (1100K) commonly used on Linux and compatible operating systems</li>
+ <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla336.zip?download">zip format</a> (1250K) commonly used on Windows</li>
+ <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla336.tgz?download">tgz format</a> (1100K) 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 c15889817..691df493d 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -448,7 +448,7 @@
</h3>
<ul>
<li>
- Released 3 September 2013.
+ Released 15 October 2013.
</li>
<li>
Added functions to help convert between substyles and base styles and between secondary and primary styles.
diff --git a/doc/index.html b/doc/index.html
index ef67d93e1..0d18d1d5a 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="20130831" />
+ <meta name="Date.Modified" content="20131015" />
<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.3.5<br />
- Site last modified August 31 2013</font>
+ <font color="#FFCC99" size="3"> Release version 3.3.6<br />
+ Site last modified October 15 2013</font>
</td>
<td width="20%">
&nbsp;
@@ -71,6 +71,7 @@
</tr>
</table>
<ul id="versionlist">
+ <li>Version 3.3.6 adds support for the Rust language and fixes bugs.</li>
<li>Version 3.3.5 can represent characters with strings. This may be used for modes
which show invisible characters or differentiate characters that appear similar.</li>
<li>Version 3.3.4 better supports Unicode use in lexers.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 5bd896008..892270dd1 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEdit
TEMPLATE = lib
CONFIG += lib_bundle
-VERSION = 3.3.5
+VERSION = 3.3.6
SOURCES += \
ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 8a3c5da87..6fd19cd25 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEditBase
TEMPLATE = lib
CONFIG += lib_bundle
-VERSION = 3.3.5
+VERSION = 3.3.6
SOURCES += \
PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 3d9988adc..e64f24d55 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-335
+336
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index b7267778b..caa121691 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
#include <windows.h>
-#define VERSION_SCINTILLA "3.3.5"
-#define VERSION_WORDS 3, 3, 5, 0
+#define VERSION_SCINTILLA "3.3.6"
+#define VERSION_WORDS 3, 3, 6, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS