From d1b6116ed73f2872766ab77917948c91f9e26b2d Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Fri, 22 Feb 2013 18:17:55 +1100
Subject: Prepare for 3.2.5.

---
 doc/ScintillaDownload.html                 | 10 +++++-----
 doc/ScintillaHistory.html                  |  8 ++++++++
 doc/index.html                             | 10 ++++------
 qt/ScintillaEdit/ScintillaEdit.pro         |  2 +-
 qt/ScintillaEditBase/ScintillaEditBase.pro |  2 +-
 version.txt                                |  2 +-
 win32/ScintRes.rc                          |  4 ++--
 7 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index e72a9f0f4..905d4a22a 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/scintilla324.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla325.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla324.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla325.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.2.4
+       Release 3.2.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/scintilla324.zip?download">zip format</a> (1250K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla324.tgz?download">tgz format</a> (1100K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla325.zip?download">zip format</a> (1250K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla325.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 fb3e71478..ef404f9d0 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -430,6 +430,14 @@
         Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
       </li>
     </ul>
+    <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite325.zip?download">Release 3.2.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 February 2013.
+	</li>
+    <ul>
     <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite324.zip?download">Release 3.2.4</a>
     </h3>
diff --git a/doc/index.html b/doc/index.html
index 2da685fe5..2548ba7ba 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="20130117" />
+    <meta name="Date.Modified" content="20130226" />
     <style type="text/css">
         #versionlist {
             margin: 0;
@@ -55,8 +55,8 @@
           GTK+</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 3.2.4<br />
-           Site last modified January 17 2013</font>
+          <font color="#FFCC99" size="3"> Release version 3.2.5<br />
+           Site last modified February 26 2013</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,14 +71,12 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.2.5.</li>
       <li>Version 3.2.4 does not truncate copies to clipboard at NULs and adds a folder for LaTeX.</li>
       <li>Version 3.2.3 improves speed when performing multiple searches.</li>
       <li>Version 3.2.2 supports retina displays on Cocoa.</li>
       <li>Version 3.2.1 adds some minor features and fixes bugs.</li>
       <li>Version 3.2.0 adds support for the Qt platform and PySide Python bindings.</li>
-      <li>Version 3.1.0 adds an animated find indicator on Cocoa.</li>
-      <li>Version 3.0.4 fixes minor problems particularly with Direct2D.</li>
-      <li>Version 3.0.3 uses fractional positioning in more situations.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="http://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 467e39554..df48c8d38 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -10,7 +10,7 @@ TARGET = ScintillaEdit
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.2.4
+VERSION = 3.2.5
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 0b875573a..997f0643d 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -10,7 +10,7 @@ TARGET = ScintillaEditBase
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.2.4
+VERSION = 3.2.5
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index d3824c297..6ac793b42 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-324
+325
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index b432c739b..80052b44e 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.2.4"
-#define VERSION_WORDS 3, 2, 4, 0
+#define VERSION_SCINTILLA "3.2.5"
+#define VERSION_WORDS 3, 2, 5, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
-- 
cgit v1.2.3