From efd57913db58a6f16f80e345cc45a1ac2113b3e7 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 29 Nov 2014 08:26:52 +1100
Subject: Updates for 3.5.2 release.

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

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index c1c6d3195..a511e83a2 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/scintilla351.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla352.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla351.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla352.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.5.1
+       Release 3.5.2
     </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/scintilla351.zip?download">zip format</a> (1450K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla351.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla352.zip?download">zip format</a> (1450K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla352.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 75300da7f..dbd60f3e8 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -475,11 +475,11 @@
       </li>
     </ul>
     <h3>
-       <a href="http://prdownloads.sourceforge.net/scintilla/scite351.zip?download">Release 3.5.1</a>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite352.zip?download">Release 3.5.2</a>
     </h3>
     <ul>
 	<li>
-	Released 30 September 2014.
+	Released 2 December 2014.
 	</li>
 	<li>
 	For OS X Cocoa switch C++ runtime to libc++ to enable use of features that will never
@@ -501,7 +501,7 @@
 	</li>
 	<li>
 	Allow platform overrides for drawing tab arrows, wrap markers, and line markers.
-	Variable for size of double click detection area.
+	Size of double click detection area is a variable.
 	These enable better visuals and behaviour for PLAT_CURSES as it is character cell based.
 	</li>
 	<li>
@@ -525,7 +525,7 @@
 	<a href="http://sourceforge.net/p/scintilla/bugs/1643/">Bug #1643</a>.
 	</li>
 	<li>
-	On Windows another DirectWrite mode SC_TECHNOLOGY_DIRECTWRITEDC added
+	On Windows, another DirectWrite mode SC_TECHNOLOGY_DIRECTWRITEDC added
 	which may avoid drawing failures in some circumstances by drawing into a GDI DC.
 	This feature is provisional and may be changed or removed if a better solution is found.
 	</li>
diff --git a/doc/index.html b/doc/index.html
index 2ef5a3308..457bea0b5 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="20140930" />
+    <meta name="Date.Modified" content="20141202" />
     <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.5.1<br />
-           Site last modified September 30 2014</font>
+          <font color="#FFCC99" size="3"> Release version 3.5.2<br />
+           Site last modified December 2 2014</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,14 +71,10 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.5.2 only supports 64-bit builds for OS X 10.7+ Cocoa. Provisional support of C++11 &lt;regex&gt;.</li>
       <li>Version 3.5.1 fixes minor bugs and includes a lexer for BibTeX.</li>
       <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>
-      <li>Version 3.4.1 fixes a regression in 3.4.0 that stopped the caret moving when lines were wrapped.</li>
-      <li>Version 3.4.0 finalises the Unicode line ends and substyles features provisionally added in 3.2.5.</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 d4bc788c5..05cf4d53a 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEdit
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.5.1
+VERSION = 3.5.2
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 85876cf67..8b257b4b6 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEditBase
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.5.1
+VERSION = 3.5.2
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 1caed7b76..ec9163d78 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-351
+352
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 4033fdf76..aa4bebf8b 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.5.1"
-#define VERSION_WORDS 3, 5, 1, 0
+#define VERSION_SCINTILLA "3.5.2"
+#define VERSION_WORDS 3, 5, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
-- 
cgit v1.2.3