diff options
| -rw-r--r-- | cocoa/Scintilla/Info.plist | 2 | ||||
| -rw-r--r-- | cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj | 8 | ||||
| -rw-r--r-- | cocoa/ScintillaFramework/Info.plist | 4 | ||||
| -rw-r--r-- | doc/ScintillaDownload.html | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 2 | ||||
| -rw-r--r-- | doc/index.html | 7 | ||||
| -rw-r--r-- | lexilla/src/Lexilla/Info.plist | 2 | ||||
| -rw-r--r-- | lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | lexilla/src/LexillaVersion.rc | 4 | ||||
| -rw-r--r-- | lexilla/version.txt | 2 | ||||
| -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 | 
14 files changed, 28 insertions, 27 deletions
| diff --git a/cocoa/Scintilla/Info.plist b/cocoa/Scintilla/Info.plist index 1019dda43..9637b2e87 100644 --- a/cocoa/Scintilla/Info.plist +++ b/cocoa/Scintilla/Info.plist @@ -15,7 +15,7 @@  	<key>CFBundlePackageType</key>  	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>  	<key>CFBundleShortVersionString</key> -	<string>4.4.5</string> +	<string>4.4.6</string>  	<key>CFBundleVersion</key>  	<string>$(CURRENT_PROJECT_VERSION)</string>  	<key>NSHumanReadableCopyright</key> diff --git a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj index 20821be22..0a038e5e1 100644 --- a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj +++ b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj @@ -633,7 +633,7 @@  				CLANG_WARN_UNREACHABLE_CODE = YES;  				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;  				COPY_PHASE_STRIP = NO; -				CURRENT_PROJECT_VERSION = 4.4.5; +				CURRENT_PROJECT_VERSION = 4.4.6;  				DEBUG_INFORMATION_FORMAT = dwarf;  				ENABLE_STRICT_OBJC_MSGSEND = YES;  				ENABLE_TESTABILITY = YES; @@ -695,7 +695,7 @@  				CLANG_WARN_UNREACHABLE_CODE = YES;  				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;  				COPY_PHASE_STRIP = NO; -				CURRENT_PROJECT_VERSION = 4.4.5; +				CURRENT_PROJECT_VERSION = 4.4.6;  				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";  				ENABLE_NS_ASSERTIONS = NO;  				ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -724,7 +724,7 @@  				CODE_SIGN_IDENTITY = "-";  				CODE_SIGN_STYLE = Manual;  				COMBINE_HIDPI_IMAGES = YES; -				CURRENT_PROJECT_VERSION = 4.4.5; +				CURRENT_PROJECT_VERSION = 4.4.6;  				DEFINES_MODULE = YES;  				DEVELOPMENT_TEAM = "";  				DYLIB_COMPATIBILITY_VERSION = 1; @@ -759,7 +759,7 @@  				CODE_SIGN_IDENTITY = "-";  				CODE_SIGN_STYLE = Manual;  				COMBINE_HIDPI_IMAGES = YES; -				CURRENT_PROJECT_VERSION = 4.4.5; +				CURRENT_PROJECT_VERSION = 4.4.6;  				DEFINES_MODULE = YES;  				DEVELOPMENT_TEAM = "";  				DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist index e38519750..4f88dfde2 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>4.4.5</string> +	<string>4.4.6</string>  	<key>CFBundleSignature</key>  	<string>????</string>  	<key>CFBundleVersion</key> -	<string>4.4.5</string> +	<string>4.4.6</string>  	<key>NSPrincipalClass</key>  	<string></string>  </dict> diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index 518a613c3..1d165ec83 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/scintilla445.zip"> +          <font size="4"> <a href="https://www.scintilla.org/scintilla446.zip">  	Windows</a>   -	<a href="https://www.scintilla.org/scintilla445.tgz"> +	<a href="https://www.scintilla.org/scintilla446.tgz">            GTK/Linux</a>    	</font>          </td> @@ -42,7 +42,7 @@        containing very few restrictions.      </p>      <h3> -       Release 4.4.5 +       Release 4.4.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="https://www.scintilla.org/scintilla445.zip">zip format</a> (1.8M) commonly used on Windows</li> -       <li><a href="https://www.scintilla.org/scintilla445.tgz">tgz format</a> (1.6M) commonly used on Linux and compatible operating systems</li> +       <li><a href="https://www.scintilla.org/scintilla446.zip">zip format</a> (1.8M) commonly used on Windows</li> +       <li><a href="https://www.scintilla.org/scintilla446.tgz">tgz format</a> (1.6M) 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 1fcfee6fd..d860f1952 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -577,7 +577,7 @@      </h3>      <ul>  	<li> -	Released 11 September 2020. +	Released 1 December 2020.  	</li>  	<li>  	Fix building with Xcode 12. diff --git a/doc/index.html b/doc/index.html index d224dfe63..c95eb6acd 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="20200911" /> +    <meta name="Date.Modified" content="20201201" />      <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 4.4.5<br /> -           Site last modified September 11 2020</font> +          <font color="#FFCC99" size="3"> Release version 4.4.6<br /> +           Site last modified December 1 2020</font>          </td>          <td width="20%">              @@ -72,6 +72,7 @@        </tr>      </table>      <ul id="versionlist"> +      <li>Version 4.4.6 fixes building with Xcode 12.</li>        <li>Version 4.4.5 fixes bugs with indicators, margin text, and ineffective layout caching.</li>        <li>Version 4.4.4 implements end of line annotations.</li>        <li>Version 4.4.3 was released just to fix SciTE.</li> diff --git a/lexilla/src/Lexilla/Info.plist b/lexilla/src/Lexilla/Info.plist index 1019dda43..9637b2e87 100644 --- a/lexilla/src/Lexilla/Info.plist +++ b/lexilla/src/Lexilla/Info.plist @@ -15,7 +15,7 @@  	<key>CFBundlePackageType</key>  	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>  	<key>CFBundleShortVersionString</key> -	<string>4.4.5</string> +	<string>4.4.6</string>  	<key>CFBundleVersion</key>  	<string>$(CURRENT_PROJECT_VERSION)</string>  	<key>NSHumanReadableCopyright</key> diff --git a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj index ef5e73b4e..a5d0b8738 100644 --- a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj +++ b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj @@ -830,7 +830,7 @@  			buildSettings = {  				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";  				CODE_SIGN_STYLE = Automatic; -				CURRENT_PROJECT_VERSION = 4.4.5; +				CURRENT_PROJECT_VERSION = 4.4.6;  				DEVELOPMENT_TEAM = 4F446KW87E;  				DYLIB_COMPATIBILITY_VERSION = 1;  				DYLIB_CURRENT_VERSION = 1; @@ -855,7 +855,7 @@  			buildSettings = {  				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";  				CODE_SIGN_STYLE = Automatic; -				CURRENT_PROJECT_VERSION = 4.4.5; +				CURRENT_PROJECT_VERSION = 4.4.6;  				DEVELOPMENT_TEAM = 4F446KW87E;  				DYLIB_COMPATIBILITY_VERSION = 1;  				DYLIB_CURRENT_VERSION = 1; diff --git a/lexilla/src/LexillaVersion.rc b/lexilla/src/LexillaVersion.rc index f7e3d16cb..0afa04452 100644 --- a/lexilla/src/LexillaVersion.rc +++ b/lexilla/src/LexillaVersion.rc @@ -4,8 +4,8 @@  #include <windows.h> -#define VERSION_LEXILLA "4.4.5" -#define VERSION_WORDS 4, 4, 5, 0 +#define VERSION_LEXILLA "4.4.6" +#define VERSION_WORDS 4, 4, 6, 0  VS_VERSION_INFO VERSIONINFO  FILEVERSION	VERSION_WORDS diff --git a/lexilla/version.txt b/lexilla/version.txt index e5a135a53..018783526 100644 --- a/lexilla/version.txt +++ b/lexilla/version.txt @@ -1 +1 @@ -445 +446 diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index 32320c2da..34a7c29bd 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -12,7 +12,7 @@ TEMPLATE = lib  CONFIG += lib_bundle  CONFIG += c++1z -VERSION = 4.4.5 +VERSION = 4.4.6  SOURCES += \      ScintillaEdit.cpp \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index c0e6c7605..0a87daf6c 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -12,7 +12,7 @@ TEMPLATE = lib  CONFIG += lib_bundle  CONFIG += c++1z -VERSION = 4.4.5 +VERSION = 4.4.6  SOURCES += \      PlatQt.cpp \ diff --git a/version.txt b/version.txt index e5a135a53..018783526 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -445 +446 diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index f3285935a..71b1b9960 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -4,8 +4,8 @@  #include <windows.h> -#define VERSION_SCINTILLA "4.4.5" -#define VERSION_WORDS 4, 4, 5, 0 +#define VERSION_SCINTILLA "4.4.6" +#define VERSION_WORDS 4, 4, 6, 0  VS_VERSION_INFO VERSIONINFO  FILEVERSION	VERSION_WORDS | 
