Updates for 3.6.7.

8 files changed, 22 insertions, 21 deletions

diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index 27ac71599..34dc896c0 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.6</string>
+	<string>3.6.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.6.6</string>
+	<string>3.6.7</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index fb00c831a..017862938 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/scintilla366.zip">
+          <font size="4"> <a href="http://www.scintilla.org/scintilla367.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://www.scintilla.org/scintilla366.tgz">
+	<a href="http://www.scintilla.org/scintilla367.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.6.6
+       Release 3.6.7
     </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/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>
+       <li><a href="http://www.scintilla.org/scintilla367.zip">zip format</a> (1500K) commonly used on Windows</li>
+       <li><a href="http://www.scintilla.org/scintilla367.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 6a07b5ff5..60a52fb2e 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -514,23 +514,23 @@
     </h3>
     <ul>
 	<li>
-	Released 24 May 2016.
+	Released 4 September 2016.
 	</li>
 	<li>
 	C++11 range-based for loops used in SciTE so GCC 4.6 is now the minimum supported version.
 	</li>
 	<li>
-	SCVS_NOWRAPLINESTART option stops left arrow from wrapping to the previous line.
-	Most commonly wanted when virtual space is used.
-	<a href="http://sourceforge.net/p/scintilla/bugs/1648/">Bug #1648</a>.
-	</li>
-	<li>
 	SC_CHARSET_DEFAULT now means code page 1252 on Windows unless a code page is set.
 	This prevents unexpected behaviour and crashes on East Asian systems where default locales are commonly DBCS.
 	Projects which want to default to DBCS code pages in East Asian locales should set the code page and
 	character set explicitly.
 	</li>
 	<li>
+	SCVS_NOWRAPLINESTART option stops left arrow from wrapping to the previous line.
+	Most commonly wanted when virtual space is used.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1648/">Bug #1648</a>.
+	</li>
+	<li>
 	The C++ lexer can fold on #else and #elif with the fold.cpp.preprocessor.at.else property.
 	<a href="http://sourceforge.net/p/scintilla/feature-requests/210/">Bug #210</a>.
 	</li>
diff --git a/doc/index.html b/doc/index.html
index 7122535bd..afa573763 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="20160524" />
+    <meta name="Date.Modified" content="20160904" />
     <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.6<br />
-           Site last modified May 24 2016</font>
+          <font color="#FFCC99" size="3"> Release version 3.6.7<br />
+           Site last modified September 4 2016</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.6.7 changes SC_CHARSET_DEFAULT on Windows to mean European code page 1252 unless a code page is set.
       <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+.
       Type definitions Sci_Position, Sci_PositionU, and Sci_PositionCR allow client
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 88cb5e0b9..f142bc847 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -20,7 +20,7 @@ unix {
     }
 }
 
-VERSION = 3.6.6
+VERSION = 3.6.7
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 2bcdb7383..7e5c4816b 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -20,7 +20,7 @@ unix {
     }
 }
 
-VERSION = 3.6.6
+VERSION = 3.6.7
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 4203007dd..526204c86 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-366
+367
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 320e715da..5a9d5d3a9 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.6.6"
-#define VERSION_WORDS 3, 6, 6, 0
+#define VERSION_SCINTILLA "3.6.7"
+#define VERSION_WORDS 3, 6, 7, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS