From 50316daa0ecb5246e5d44d62d29096ef2a9fa76a Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 19 Jun 2015 11:05:07 +1000
Subject: Updates for release 3.5.7.

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

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index ba0654690..fd2c76b83 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://www.scintilla.org/scintilla356.zip">
+          <font size="4"> <a href="http://www.scintilla.org/scintilla357.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://www.scintilla.org/scintilla356.tgz">
+	<a href="http://www.scintilla.org/scintilla357.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.5.6
+       Release 3.5.7
     </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://www.scintilla.org/scintilla356.zip">zip format</a> (1450K) commonly used on Windows</li>
-       <li><a href="http://www.scintilla.org/scintilla356.tgz">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://www.scintilla.org/scintilla357.zip">zip format</a> (1450K) commonly used on Windows</li>
+       <li><a href="http://www.scintilla.org/scintilla357.tgz">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/index.html b/doc/index.html
index af9b313c5..80b45aabe 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="20150526" />
+    <meta name="Date.Modified" content="20150620" />
     <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.6<br />
-           Site last modified May 26 2015</font>
+          <font color="#FFCC99" size="3"> Release version 3.5.7<br />
+           Site last modified June 20 2015</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,6 +71,8 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.5.7 fixes a crash on Cocoa with drag and drop and adds commands to add the next or each occurrence of the
+           main selection to the set of selections.</li>
       <li>Version 3.5.6 fixes a bug with undo on Cocoa that could lose data.</li>
       <li>Version 3.5.5 improves IME on Qt and fixes minor bugs.</li>
       <li>Version 3.5.4 improves indicators to be able to change appearance on mouse-over and to use a wide variety of colours together.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 1fe61cffb..c0c9f43d8 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.6
+VERSION = 3.5.7
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 93dda6e79..52bda7345 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.6
+VERSION = 3.5.7
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 53d5a5ad6..4adf98449 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-356
+357
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 3e4a0563b..810a1a3ca 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.5.6"
-#define VERSION_WORDS 3, 5, 6, 0
+#define VERSION_SCINTILLA "3.5.7"
+#define VERSION_WORDS 3, 5, 7, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
-- 
cgit v1.2.3