From 95d69cb5ea8e477bbd1177f2db591e81f4b62deb Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Fri, 5 Feb 2021 18:19:35 +0100 Subject: [PATCH 1/2] + Upd: Version files and Changes.txt --- Build/Changes.txt | 2 +- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index a7adf748c..8377a217d 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -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). diff --git a/Versions/build.txt b/Versions/build.txt index d00491fd7..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +2 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index e630dc236..c89193596 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index 4bb2e7cca..c420d291b 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 21 #define VERSION_REV 205 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define SCINTILLA_VER 446 #define ONIGURUMA_REGEX_VER 6.9.6 #define UCHARDET_VER 2018.09.27 From 63fa5bdb2f6d51df3da8754aa9d3aa74aa5dfca0 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sun, 7 Feb 2021 16:00:47 +0100 Subject: [PATCH 2/2] Preparation Version files for Release_Canditate_5.21.207.1 --- Build/Changes.txt | 2 +- Versions/build.txt | 2 +- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 4 ++-- src/VersionEx.h | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 8377a217d..e6c824a67 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -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) ======================================================== -------------------------------------------------------- diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +1 diff --git a/Versions/day.txt b/Versions/day.txt index 485369e4e..c92ba5684 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -205 +207 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index c89193596..602106b82 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 beta + Notepad3 rc diff --git a/src/VersionEx.h b/src/VersionEx.h index c420d291b..165c7c685 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,12 +8,12 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 21 -#define VERSION_REV 205 -#define VERSION_BUILD 2 +#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