aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2014-03-18 08:11:10 +1100
committerNeil <nyamatongwe@gmail.com>2014-03-18 08:11:10 +1100
commitce485ff65d257dc4f19c21f40b82cac437e76196 (patch)
tree8c8abb5713780ae75e48481e62b026a92b0d0f02
parent44d614e2dac0488d3bf3e0f65368bc7515fa91c5 (diff)
downloadscintilla-mirror-ce485ff65d257dc4f19c21f40b82cac437e76196.tar.gz
Updating to get ready for 3.4.0.
-rw-r--r--doc/ScintillaDownload.html10
-rw-r--r--doc/ScintillaHistory.html2
-rw-r--r--doc/index.html6
-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, 14 insertions, 14 deletions
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 1b0e2f186..11b94dca8 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/scintilla339.zip?download">
+ <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla340.zip?download">
Windows</a>&nbsp;&nbsp;
- <a href="http://prdownloads.sourceforge.net/scintilla/scintilla339.tgz?download">
+ <a href="http://prdownloads.sourceforge.net/scintilla/scintilla340.tgz?download">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -41,7 +41,7 @@
containing very few restrictions.
</p>
<h3>
- Release 3.3.9
+ Release 3.4.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/scintilla339.zip?download">zip format</a> (1450K) commonly used on Windows</li>
- <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla339.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
+ <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla340.zip?download">zip format</a> (1450K) commonly used on Windows</li>
+ <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla340.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 35598a358..8e05bc209 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -460,7 +460,7 @@
</h3>
<ul>
<li>
- Released 31 January 2014.
+ Released 24 March 2014.
</li>
<li>
The Unicode line ends and substyles features added as provisional in 3.2.5 are now finalised.
diff --git a/doc/index.html b/doc/index.html
index 5d1287499..767e9fb7f 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="20140131" />
+ <meta name="Date.Modified" content="20140324" />
<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.9<br />
- Site last modified January 31 2014</font>
+ <font color="#FFCC99" size="3"> Release version 3.4.0<br />
+ Site last modified March 24 2014</font>
</td>
<td width="20%">
&nbsp;
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 7474f12bd..91111692c 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.9
+VERSION = 3.4.0
SOURCES += \
ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 3545060fb..45848a736 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.9
+VERSION = 3.4.0
SOURCES += \
PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 1ce6b02d7..51272bac5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-339
+340
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index a057a2e5d..5bc5fb716 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
#include <windows.h>
-#define VERSION_SCINTILLA "3.3.9"
-#define VERSION_WORDS 3, 3, 9, 0
+#define VERSION_SCINTILLA "3.4.0"
+#define VERSION_WORDS 3, 4, 0, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS