aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cocoa/Scintilla/Info.plist2
-rw-r--r--cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj8
-rw-r--r--doc/ScintillaDownload.html10
-rw-r--r--doc/ScintillaHistory.html2
-rw-r--r--doc/index.html7
-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, 20 insertions, 19 deletions
diff --git a/cocoa/Scintilla/Info.plist b/cocoa/Scintilla/Info.plist
index 7962ac390..fc2df01e4 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>5.1.4</string>
+ <string>5.1.5</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 2f9386f64..55df47ed6 100644
--- a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -565,7 +565,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 5.1.4;
+ CURRENT_PROJECT_VERSION = 5.1.5;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@@ -627,7 +627,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 5.1.4;
+ CURRENT_PROJECT_VERSION = 5.1.5;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -657,7 +657,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 5.1.4;
+ CURRENT_PROJECT_VERSION = 5.1.5;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -691,7 +691,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 5.1.4;
+ CURRENT_PROJECT_VERSION = 5.1.5;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index a81c515ce..1ee319635 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/scintilla514.zip">
+ <font size="4"> <a href="https://www.scintilla.org/scintilla515.zip">
Windows</a>&nbsp;&nbsp;
- <a href="https://www.scintilla.org/scintilla514.tgz">
+ <a href="https://www.scintilla.org/scintilla515.tgz">
GTK/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -42,7 +42,7 @@
containing very few restrictions.
</p>
<h3>
- Release 5.1.4
+ Release 5.1.5
</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/scintilla514.zip">zip format</a> (1.3M) commonly used on Windows</li>
- <li><a href="https://www.scintilla.org/scintilla514.tgz">tgz format</a> (1.2M) commonly used on Linux and compatible operating systems</li>
+ <li><a href="https://www.scintilla.org/scintilla515.zip">zip format</a> (1.3M) commonly used on Windows</li>
+ <li><a href="https://www.scintilla.org/scintilla515.tgz">tgz format</a> (1.2M) 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 35365dbda..c4aec9cc9 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -574,7 +574,7 @@
</h3>
<ul>
<li>
- Released 8 November 2021.
+ Released 7 December 2021.
</li>
<li>
ScintillaEditPy, Python bindings for Qt using PySide, has been removed.
diff --git a/doc/index.html b/doc/index.html
index 1b4df72be..e73f50f14 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="20211108" />
+ <meta name="Date.Modified" content="20211207" />
<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 5.1.4<br />
- Site last modified November 8 2021</font>
+ <font color="#FFCC99" size="3"> Release version 5.1.5<br />
+ Site last modified December 7 2021</font>
</td>
<td width="20%">
&nbsp;
@@ -72,6 +72,7 @@
</tr>
</table>
<ul id="versionlist">
+ <li>Version 5.1.5 changes string-returning APIs to be more consistent and removes ScintillaEditPy.</li>
<li>Version 5.1.4 fixes primary selection paste within one instance on GTK.</li>
<li>Version 5.1.3 fixes a layout bug with monospaced fonts on Cocoa.</li>
<li>Version 5.1.2 can optimize monospaced fonts and allows hiding the first line.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index c7596415b..4326dc4b3 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
CONFIG += lib_bundle
CONFIG += c++1z
-VERSION = 5.1.4
+VERSION = 5.1.5
SOURCES += \
ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 3bb1608bf..9179e32f4 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
CONFIG += lib_bundle
CONFIG += c++1z
-VERSION = 5.1.4
+VERSION = 5.1.5
SOURCES += \
PlatQt.cpp \
diff --git a/version.txt b/version.txt
index a08796291..3cda32fc2 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-514
+515
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 68c712e5c..607ef4092 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
#include <windows.h>
-#define VERSION_SCINTILLA "5.1.4"
-#define VERSION_WORDS 5, 1, 4, 0
+#define VERSION_SCINTILLA "5.1.5"
+#define VERSION_WORDS 5, 1, 5, 0
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_WORDS
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 02:17:45 +0000