aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--LongTermDownload.html73
-rw-r--r--cocoa/ScintillaFramework/Info.plist4
-rw-r--r--doc/ScintillaDownload.html10
-rw-r--r--doc/ScintillaHistory.html13
-rw-r--r--doc/index.html2
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.pro2
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.pro2
-rw-r--r--version.txt2
-rw-r--r--win32/ScintRes.rc4
9 files changed, 97 insertions, 15 deletions
diff --git a/LongTermDownload.html b/LongTermDownload.html
new file mode 100644
index 000000000..bf8ef3db2
--- /dev/null
+++ b/LongTermDownload.html
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta name="generator" content="HTML Tidy, see www.w3.org" />
+ <meta name="generator" content="SciTE" />
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <title>
+ Download Scintilla
+ </title>
+ </head>
+ <body bgcolor="#FFFFFF" text="#000000">
+ <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+ <tr>
+ <td>
+ <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+ </td>
+ <td>
+ <a href="index.html" style="color:white;text-decoration:none"><font size="5">Download
+ Scintilla</font></a>
+ </td>
+ </tr>
+ </table>
+ <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
+ <tr>
+ <td>
+ <font size="4"> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.1/scintilla3101.zip/download">
+ Windows</a>&nbsp;&nbsp;
+ <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.1/scintilla3101.tgz/download">
+ GTK+/Linux</a>&nbsp;&nbsp;
+ </font>
+ </td>
+ </tr>
+ </table>
+ <h2>
+ Download.
+ </h2>
+ <p>
+ This page is for the LongTerm3 branch of Scintilla which avoids depending on C++14 or later features.
+ Compilers as old as GCC 4.8, MSVC 2015, and Clang 3.4 are supported.
+ </p>
+ <p>
+ The <a href="License.txt">license</a> for using Scintilla is similar to that of Python
+ containing very few restrictions.
+ </p>
+ <h3>
+ Release 3.10.1
+ </h3>
+ <h4>
+ Source Code
+ </h4>
+ 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="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.1/scintilla3101.zip/download">zip format</a> (1600K) commonly used on Windows</li>
+ <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.1/scintilla3101.tgz/download">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.
+ <p>
+ Previous versions can be downloaded from the <a href="ScintillaHistory.html">history
+ page</a>.
+ </p>
+ <p>
+ Also available from Mercurial:
+ </p>
+ <pre>
+ hg clone http://hg.code.sf.net/p/scintilla/code scintilla
+ cd scintilla && hg update LongTerm3
+ </pre>
+ </body>
+</html>
diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index c59ac9441..207c4d2a7 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.10.0</string>
+ <string>3.10.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>3.10.0</string>
+ <string>3.10.1</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index c363a1fe2..f3cb72b36 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="https://www.scintilla.org/scintilla3100.zip">
+ <font size="4"> <a href="https://www.scintilla.org/scintilla3101.zip">
Windows</a>&nbsp;&nbsp;
- <a href="https://www.scintilla.org/scintilla3100.tgz">
+ <a href="https://www.scintilla.org/scintilla3101.tgz">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -42,7 +42,7 @@
containing very few restrictions.
</p>
<h3>
- Release 3.10.0
+ Release 3.10.1
</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="https://www.scintilla.org/scintilla3100.zip">zip format</a> (1600K) commonly used on Windows</li>
- <li><a href="https://www.scintilla.org/scintilla3100.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+ <li><a href="https://www.scintilla.org/scintilla3101.zip">zip format</a> (1600K) commonly used on Windows</li>
+ <li><a href="https://www.scintilla.org/scintilla3101.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 3a371b5b9..6d67c2f13 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -540,11 +540,11 @@
</li>
</ul>
<h3>
- <a href="https://www.scintilla.org/scite411.zip">Release 4.1.1</a>
+ <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.1/scintilla3101.zip/download">Release 3.10.1</a>
</h3>
<ul>
<li>
- Released 19 June 2018.
+ Released 31 October 2018.
</li>
<li>
Add SCI_SETCOMMANDEVENTS API to allow turning off command events as they
@@ -584,6 +584,15 @@
<li>
Fix margin cursor on Cocoa to point more accurately.
</li>
+ <li>
+ Updated ConTeXt Lua LPeg lexer.
+ </li>
+ <li>
+ Improved folding of traditionally single elements in HTML Lua LPeg lexer.
+ </li>
+ <li>
+ Improved accuracy of Markdown Lua LPeg lexer.
+ </li>
</ul>
<h3>
<a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.0/scintilla3100.zip/download">Release 3.10.0</a>
diff --git a/doc/index.html b/doc/index.html
index 1c86f9a01..208b1ce94 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -56,7 +56,7 @@
GTK+, and OS X</font>
</td>
<td width="40%" align="right">
- <font color="#FFCC99" size="3"> Release version 3.10.0<br />
+ <font color="#FFCC99" size="3"> Release version 3.10.1<br />
Site last modified February 12 2018</font>
</td>
<td width="20%">
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index f9401b0c8..c7ec7ee95 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -20,7 +20,7 @@ unix {
}
}
-VERSION = 3.10.0
+VERSION = 3.10.1
SOURCES += \
ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 683bce111..0466f17eb 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -19,7 +19,7 @@ unix {
}
}
-VERSION = 3.10.0
+VERSION = 3.10.1
SOURCES += \
PlatQt.cpp \
diff --git a/version.txt b/version.txt
index d9d811cb3..b129ca53f 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3100
+3101
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 742cccdba..42411182d 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
#include <windows.h>
-#define VERSION_SCINTILLA "3.10.0"
-#define VERSION_WORDS 3, 10, 0, 0
+#define VERSION_SCINTILLA "3.10.1"
+#define VERSION_WORDS 3, 10, 1, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS