Updating for version 2.25.

5 files changed, 24 insertions, 13 deletions

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 3f07607ee..e9dafb944 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/scintilla224.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla225.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla224.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla225.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 2.24
+       Release 2.25
     </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/scintilla224.zip?download">zip format</a> (1180K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla224.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla225.zip?download">zip format</a> (1180K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla225.tgz?download">tgz format</a> (1080K) 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 f94c8cc6e..e167e25fc 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -380,6 +380,16 @@
       </li>
     </ul>
     <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite225.zip?download">Release 2.25</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 March 2011.
+	</li>
+	<li>
+	</li>
+    <ul>
+    <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite224.zip?download">Release 2.24</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index ebb28e849..351f0afd1 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="20110203" />
+    <meta name="Date.Modified" content="20110323" />
     <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 2.24<br />
-           Site last modified February 3 2011</font>
+          <font color="#FFCC99" size="3"> Release version 2.25<br />
+           Site last modified March 23 2011</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,6 +71,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 2.25 .</li>
       <li>Version 2.24 fixes a memory leak on GTK+ with Cairo.</li>
       <li>Version 2.23 uses Cairo for drawing on GTK+ 2.22+ rather than GDK.</li>
       <li>Version 2.22 fixes bugs and adds minor improvements.</li>
diff --git a/version.txt b/version.txt
index 20c90807c..188ccfe56 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-224
+225
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index b2dc4e206..cdeb190b4 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -5,8 +5,8 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION	2, 2, 4, 0
-PRODUCTVERSION	2, 2, 4, 0
+FILEVERSION	2, 2, 5, 0
+PRODUCTVERSION	2, 2, 5, 0
 FILEFLAGSMASK	0x3fL
 FILEFLAGS 0
 FILEOS VOS_NT_WINDOWS32
@@ -23,12 +23,12 @@ BEGIN
 		BEGIN
 			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
 			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component\0"
-			VALUE	"FileVersion",	"2.24\0"
+			VALUE	"FileVersion",	"2.25\0"
 			VALUE	"InternalName",	"Scintilla\0"
 			VALUE	"LegalCopyright",	"Copyright 1998-2011 by Neil Hodgson\0"
 			VALUE	"OriginalFilename",	"Scintilla.DLL\0"
 			VALUE	"ProductName",	"Scintilla\0"
-			VALUE	"ProductVersion",	"2.24\0"
+			VALUE	"ProductVersion",	"2.25\0"
 		END
 	END
 END