Updates for 3.6.1.rel-3-6-1

7 files changed, 16 insertions, 15 deletions

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index aa23c79a8..7f3f0011e 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/scintilla360.zip">
+          <font size="4"> <a href="http://www.scintilla.org/scintilla361.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://www.scintilla.org/scintilla360.tgz">
+	<a href="http://www.scintilla.org/scintilla361.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.6.0
+       Release 3.6.1
     </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/scintilla360.zip">zip format</a> (1500K) commonly used on Windows</li>
-       <li><a href="http://www.scintilla.org/scintilla360.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://www.scintilla.org/scintilla361.zip">zip format</a> (1500K) commonly used on Windows</li>
+       <li><a href="http://www.scintilla.org/scintilla361.tgz">tgz format</a> (1400K) 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 0a37b04c1..0631ef466 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -487,11 +487,11 @@
       </li>
     </ul>
     <h3>
-       <a href="http://prdownloads.sourceforge.net/scintilla/scite360.zip?download">Release 3.6.0</a>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite361.zip?download">Release 3.6.1</a>
     </h3>
     <ul>
 	<li>
-	Released 3 August 2015.
+	Released 15 September 2015.
 	</li>
 	<li>
 	The oldest version of GTK+ supported now is 2.18 and for glib it is 2.22.
diff --git a/doc/index.html b/doc/index.html
index 444b46157..7be1d8091 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="20150803" />
+    <meta name="Date.Modified" content="20150915" />
     <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.6.0<br />
-           Site last modified August 3 2015</font>
+          <font color="#FFCC99" size="3"> Release version 3.6.1<br />
+           Site last modified September 15 2015</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,6 +71,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.6.1 adds minor features and fixes bugs.</li>
       <li>Version 3.6.0 implements more multiple selection operations.
       Type definitions Sci_Position, Sci_PositionU, and Sci_PositionCR allow client
       code to prepare for a future change allowing larger than 2 GB documents.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index c6ae03b6b..48a20b236 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEdit
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.6.0
+VERSION = 3.6.1
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index c6de77433..de0b73a3e 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEditBase
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.6.0
+VERSION = 3.6.1
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 2921a1584..35329ed82 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-360
+361
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 5f3f09cd4..651f0f4f6 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.6.0"
-#define VERSION_WORDS 3, 6, 0, 0
+#define VERSION_SCINTILLA "3.6.1"
+#define VERSION_WORDS 3, 6, 1, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS