Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Akos Keresztes 2021-02-07 20:52:26 +01:00
commit 7c45ac5234
4 changed files with 7 additions and 7 deletions

View File

@ -34,7 +34,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
========================================================
Current BETA/RC Version 5.21.205.(build_#) (2021-02-05)
Current BETA/RC Version 5.21.207.(build_#) (2021-02-07)
========================================================
--------------------------------------------------------
@ -103,7 +103,7 @@ CHANGES:
[.916.1]- TinyExpr: '%' operator: distinguish between modulo and percent operation by context.
[.915.3]- Due to lack of interest, "Notepad3DLL" is discontinued.
[.915.2]- User configurable "Web Action" menu item names.
[.116.1]- Update grepWinNP3 (GRE) version 2.1.5.33 (2021-01-16).
[.205.2]- Update grepWinNP3 (GRE) version 2.1.6.34 (2021-02.05).
[.124.1]- Update Oniguruma Regex (ONI) engine version 6.9.7 (2021-01-24).
[1214.1]- Update Scintilla Library (SCI) version 4.4.6 (2020-12-01).

View File

@ -1 +1 @@
205
207

View File

@ -3,8 +3,8 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.21.205.1"
version="5.21.207.1"
type="win32"
/>
<description>Notepad3 beta</description>
<description>Notepad3 rc</description>
</assembly>

View File

@ -8,12 +8,12 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 21
#define VERSION_REV 205
#define VERSION_REV 207
#define VERSION_BUILD 1
#define SCINTILLA_VER 446
#define ONIGURUMA_REGEX_VER 6.9.6
#define UCHARDET_VER 2018.09.27
#define TINYEXPR_VER 2018.05.11
#define UTHASH_VER 2.1.0
#define VERSION_PATCH beta
#define VERSION_PATCH rc
#define VERSION_COMMIT_ID dkt1-amr