Updates for 3.6.2.

8 files changed, 19 insertions, 23 deletions

diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index be5f16e16..20e094a5f 100644
--- a/cocoa/ScintillaFramework/Info.plist
+++ b/cocoa/ScintillaFramework/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.1</string>
+	<string>3.6.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.6.1</string>
+	<string>3.6.2</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 3b0b9358c..c3574add3 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="http://www.scintilla.org/scintilla361.zip">
+          <font size="4"> <a href="http://www.scintilla.org/scintilla362.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://www.scintilla.org/scintilla361.tgz">
+	<a href="http://www.scintilla.org/scintilla362.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.6.1
+       Release 3.6.2
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,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/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>
+       <li><a href="http://www.scintilla.org/scintilla362.zip">zip format</a> (1500K) commonly used on Windows</li>
+       <li><a href="http://www.scintilla.org/scintilla362.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 8bbd18a9a..9f5155098 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -488,11 +488,11 @@
       </li>
     </ul>
     <h3>
-       <a href="http://prdownloads.sourceforge.net/scintilla/scite361.zip?download">Release 3.6.1</a>
+       <a href="http://www.scintilla.org/scite362.zip">Release 3.6.2</a>
     </h3>
     <ul>
 	<li>
-	Released 15 September 2015.
+	Released 6 November 2015.
 	</li>
 	<li>
 	Whitespace may be made visible just in indentation.
@@ -562,7 +562,7 @@
 	</li>
     </ul>
     <h3>
-       <a href="http://prdownloads.sourceforge.net/scintilla/scite361.zip?download">Release 3.6.1</a>
+       <a href="http://www.scintilla.org/scite361.zip">Release 3.6.1</a>
     </h3>
     <ul>
 	<li>
diff --git a/doc/index.html b/doc/index.html
index d6f98ea4e..0196783d1 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="20150915" />
+    <meta name="Date.Modified" content="20151106" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK+, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 3.6.1<br />
-           Site last modified September 15 2015</font>
+          <font color="#FFCC99" size="3"> Release version 3.6.2<br />
+           Site last modified November 6 2015</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,15 +72,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.6.2 fixes crashes and other bugs, particularly on Cocoa.</li>
       <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>
-      <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>
     </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 48a20b236..58c521ad1 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.1
+VERSION = 3.6.2
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index de0b73a3e..7891af0ca 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.1
+VERSION = 3.6.2
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 35329ed82..e5db9a27e 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-361
+362
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 651f0f4f6..106ce1507 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.6.1"
-#define VERSION_WORDS 3, 6, 1, 0
+#define VERSION_SCINTILLA "3.6.2"
+#define VERSION_WORDS 3, 6, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS