aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaDownload.html10
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--doc/index.html8
-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, 17 insertions, 15 deletions
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index da8b3992c..6183dc68c 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/scintilla344.zip?download">
+ <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla350.zip?download">
Windows</a>&nbsp;&nbsp;
- <a href="http://prdownloads.sourceforge.net/scintilla/scintilla344.tgz?download">
+ <a href="http://prdownloads.sourceforge.net/scintilla/scintilla350.tgz?download">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -41,7 +41,7 @@
containing very few restrictions.
</p>
<h3>
- Release 3.4.4
+ Release 3.5.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://prdownloads.sourceforge.net/scintilla/scintilla344.zip?download">zip format</a> (1450K) commonly used on Windows</li>
- <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla344.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
+ <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla350.zip?download">zip format</a> (1450K) commonly used on Windows</li>
+ <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla350.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 74b76a117..4897710e2 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -465,11 +465,11 @@
</li>
</ul>
<h3>
- <a href="http://prdownloads.sourceforge.net/scintilla/scite345.zip?download">Release 3.4.5</a>
+ <a href="http://prdownloads.sourceforge.net/scintilla/scite350.zip?download">Release 3.5.0</a>
</h3>
<ul>
<li>
- Released 3 July 2014.
+ Released 13 August 2014.
</li>
<li>
Text may share space vertically so that extreme ascenders and descenders are
diff --git a/doc/index.html b/doc/index.html
index d5a2579ae..fad54d676 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="20140703" />
+ <meta name="Date.Modified" content="20140813" />
<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.4.4<br />
- Site last modified July 3 2014</font>
+ <font color="#FFCC99" size="3"> Release version 3.5.0<br />
+ Site last modified August 13 2014</font>
</td>
<td width="20%">
&nbsp;
@@ -71,6 +71,8 @@
</tr>
</table>
<ul id="versionlist">
+ <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>
<li>Version 3.4.4 removes style byte indicators.</li>
<li>Version 3.4.3 fixes hangs and crashes at shutdown on Windows.</li>
<li>Version 3.4.2 allows the application to filter input from typing, paste, drag &amp; drop and similar.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 2ee0ef1d8..55d23944f 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEdit
TEMPLATE = lib
CONFIG += lib_bundle
-VERSION = 3.4.4
+VERSION = 3.5.0
SOURCES += \
ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 4cdd0f257..47d8b364d 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEditBase
TEMPLATE = lib
CONFIG += lib_bundle
-VERSION = 3.4.4
+VERSION = 3.5.0
SOURCES += \
PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 4772052f5..0fecf6533 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-344
+350
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index b6d87f901..6d5462932 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
#include <windows.h>
-#define VERSION_SCINTILLA "3.4.4"
-#define VERSION_WORDS 3, 4, 4, 0
+#define VERSION_SCINTILLA "3.5.0"
+#define VERSION_WORDS 3, 5, 0, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS