From c4f9a3340cf911994b2af5e89cb5abf02d8796a3 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 18 May 2016 11:32:14 +1000
Subject: Updates for 3.6.6.

---
 cocoa/ScintillaFramework/Info.plist        |  4 ++--
 doc/ScintillaDownload.html                 | 10 +++++-----
 doc/ScintillaHistory.html                  |  4 ++--
 doc/index.html                             |  7 ++++---
 qt/ScintillaEdit/ScintillaEdit.pro         |  4 ++--
 qt/ScintillaEditBase/ScintillaEditBase.pro |  4 ++--
 version.txt                                |  2 +-
 win32/ScintRes.rc                          |  4 ++--
 8 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index c9d634186..27ac71599 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.5</string>
+	<string>3.6.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.6.5</string>
+	<string>3.6.6</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 1653da539..fb00c831a 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/scintilla365.zip">
+          <font size="4"> <a href="http://www.scintilla.org/scintilla366.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://www.scintilla.org/scintilla365.tgz">
+	<a href="http://www.scintilla.org/scintilla366.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.6.5
+       Release 3.6.6
     </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/scintilla365.zip">zip format</a> (1500K) commonly used on Windows</li>
-       <li><a href="http://www.scintilla.org/scintilla365.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://www.scintilla.org/scintilla366.zip">zip format</a> (1500K) commonly used on Windows</li>
+       <li><a href="http://www.scintilla.org/scintilla366.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 fff605d6f..2f5e79bf2 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -506,13 +506,13 @@
     </h3>
     <ul>
 	<li>
-	Released 26 April 2016.
+	Released 23 May 2016.
 	</li>
 	<li>
 	C++ 11 &lt;regex&gt; support built by default. Can be disabled by defining NO_CXX11_REGEX.
 	</li>
 	<li>
-	SciTE_USERHOME environment variable allows separate location for writable peoperties files.
+	SciTE_USERHOME environment variable allows separate location for writable properties files.
 	<a href="http://sourceforge.net/p/scintilla/feature-requests/965/">Feature #965.</a>
 	</li>
 	<li>
diff --git a/doc/index.html b/doc/index.html
index faf7dc846..557ea716d 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="20160426" />
+    <meta name="Date.Modified" content="20160523" />
     <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.5<br />
-           Site last modified April 26 2016</font>
+          <font color="#FFCC99" size="3"> Release version 3.6.6<br />
+           Site last modified May 23 2016</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.6.6 enables C++11 &lt;regex&gt; by default.
       <li>Version 3.6.5 adds a JSON lexer and removes the font cache on GTK+.
       <li>Version 3.6.4 avoids some folding bugs by automatically unfolding and improves clipboard robustness on Win32.</li>
       <li>Version 3.6.3 supports idle-time styling.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 1cd72f20c..88cb5e0b9 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -13,14 +13,14 @@ CONFIG += lib_bundle
 
 unix {
     # <regex> requires C++11 support
-    greaterThan(QT_MAJOR_VERSION, 4){    
+    greaterThan(QT_MAJOR_VERSION, 4){
         CONFIG += c++11
     } else {
         QMAKE_CXXFLAGS += -std=c++0x
     }
 }
 
-VERSION = 3.6.5
+VERSION = 3.6.6
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 6695f4b3e..2bcdb7383 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -13,14 +13,14 @@ CONFIG += lib_bundle
 
 unix {
     # <regex> requires C++11 support
-    greaterThan(QT_MAJOR_VERSION, 4){    
+    greaterThan(QT_MAJOR_VERSION, 4){
         CONFIG += c++11
     } else {
         QMAKE_CXXFLAGS += -std=c++0x
     }
 }
 
-VERSION = 3.6.5
+VERSION = 3.6.6
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 475310214..4203007dd 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-365
+366
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index d0f6110b0..320e715da 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.6.5"
-#define VERSION_WORDS 3, 6, 5, 0
+#define VERSION_SCINTILLA "3.6.6"
+#define VERSION_WORDS 3, 6, 6, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
-- 
cgit v1.2.3