diff options
| -rw-r--r-- | doc/ScintillaDownload.html | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 8 | ||||
| -rw-r--r-- | doc/index.html | 10 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.pro | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 2 | ||||
| -rw-r--r-- | version.txt | 2 | ||||
| -rw-r--r-- | win32/ScintRes.rc | 4 | 
7 files changed, 20 insertions, 18 deletions
| diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index b2879244f..9e8dc3832 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://prdownloads.sourceforge.net/scintilla/scintilla341.zip?download"> +          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla342.zip?download">  	Windows</a>   -	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla341.tgz?download"> +	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla342.tgz?download">            GTK+/Linux</a>    	</font>          </td> @@ -41,7 +41,7 @@        containing very few restrictions.      </p>      <h3> -       Release 3.4.1 +       Release 3.4.2      </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://prdownloads.sourceforge.net/scintilla/scintilla341.zip?download">zip format</a> (1450K) commonly used on Windows</li> -       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla341.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li> +       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla342.zip?download">zip format</a> (1450K) commonly used on Windows</li> +       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla342.tgz?download">tgz format</a> (1300K) 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 dcee1c353..4ce80b1ba 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -464,7 +464,7 @@      </h3>      <ul>  	<li> -	Released 1 April 2014. +	Released 20 May 2014.  	</li>  	<li>  	Insertions can be filtered or modified by calling SCI_CHANGEINSERTION inside a handler for @@ -496,6 +496,10 @@  	<a href="http://sourceforge.net/p/scintilla/feature-requests/1047/">Feature #1047.</a>  	</li>  	<li> +	SciTE performs word and search match highlighting as an idle task to improve interactivity +	and allow use of these features on large files. +	</li> +	<li>  	Bug fixed on Cocoa where previous caret lines were visible.  	<a href="http://sourceforge.net/p/scintilla/bugs/1593/">Bug #1593</a>.  	</li> @@ -504,7 +508,7 @@  	<a href="http://sourceforge.net/p/scintilla/bugs/1592/">Bug #1592</a>.  	</li>  	<li> -	Fixed display flashing when scrolling with Gtk+ 3.10. +	Fixed display flashing when scrolling with GTK+ 3.10.  	<a href="http://sourceforge.net/p/scintilla/bugs/1567/">Bug #1567</a>.  	</li>  	<li> diff --git a/doc/index.html b/doc/index.html index 2cd3de5a8..28d020393 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="20140401" /> +    <meta name="Date.Modified" content="20140520" />      <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.4.1<br /> -           Site last modified April 1 2014</font> +          <font color="#FFCC99" size="3"> Release version 3.4.2<br /> +           Site last modified May 20 2014</font>          </td>          <td width="20%">              @@ -71,11 +71,9 @@        </tr>      </table>      <ul id="versionlist"> +      <li>Version 3.4.2 allows the application to filter input from the keyboard, paste, drag and drop and similar.</li>        <li>Version 3.4.1 fixes a regression in 3.4.0 that stopped the caret moving when lines were wrapped.</li>        <li>Version 3.4.0 finalises the Unicode line ends and substyles features provisionally added in 3.2.5.</li> -      <li>Version 3.3.9 fixes a bug in 3.3.8 that caused external lexers to fail.</li> -      <li>Version 3.3.8 improves drawing quality and enhances lexers.</li> -      <li>Version 3.3.7 uses responsive scrolling on OS X 10.9, enhances lexers, and fixes bugs.</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 d00532e0b..f4d2daabe 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -11,7 +11,7 @@ TARGET = ScintillaEdit  TEMPLATE = lib  CONFIG += lib_bundle -VERSION = 3.4.1 +VERSION = 3.4.2  SOURCES += \      ScintillaEdit.cpp \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index c663bd39c..27c7274a2 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -11,7 +11,7 @@ TARGET = ScintillaEditBase  TEMPLATE = lib  CONFIG += lib_bundle -VERSION = 3.4.1 +VERSION = 3.4.2  SOURCES += \      PlatQt.cpp \ diff --git a/version.txt b/version.txt index 947e93bc2..c9693eb7f 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -341 +342 diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index a3cea3c55..dd1099196 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -4,8 +4,8 @@  #include <windows.h> -#define VERSION_SCINTILLA "3.4.1" -#define VERSION_WORDS 3, 4, 1, 0 +#define VERSION_SCINTILLA "3.4.2" +#define VERSION_WORDS 3, 4, 2, 0  VS_VERSION_INFO VERSIONINFO  FILEVERSION	VERSION_WORDS | 
