From 16024f876b72195326f1f51aa72f7bb369af6e82 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 30 Nov 2021 10:39:57 +0100 Subject: [PATCH] + Upd: Version files and Changes.txt (first build after merging alpha version) --- Build/Changes.txt | 41 +++++++++++++--------------------- Versions/build.txt | 2 +- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 10 ++++----- 5 files changed, 23 insertions(+), 34 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 1b3dd23d4..60f694054 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,52 +33,41 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current BETA/RC Version 5.21.1127.(build_#) (2021-11-27) +Current BETA/RC Version 5.21.1130.(build_#) (2021-11-30) ======================================================== -------------------------------------------------------- NEW: -------------------------------------------------------- [.###.#]- . -[.alpha]- Add a Fortran Lexer. -[.alpha]- LongPath Support enhancements. --------------------------------------------------------- -[.###.#]- . -[.###.#]- . +[1130.1]- Add a Fortran Lexer. +[1130.1]- LongPath Support enhancements. -------------------------------------------------------- CHANGES: -------------------------------------------------------- [.###.#]- . -[.alpha]- Default settings: LaunchInstanceWndPosOffset=28 and LaunchInstanceFullVisible=true. -[.alpha]- Lexer Fortran: add extended intrinsic functions. -[.alpha]- Some more DynStrg refactorings and LongPath handling. --------------------------------------------------------- -[.###.#]- . -[.###.#]- . +[1130.1]- Default settings: LaunchInstanceWndPosOffset=28 and LaunchInstanceFullVisible=true. +[1130.1]- Lexer Fortran: add extended intrinsic functions. +[1130.1]- Some more DynStrg refactorings and LongPath handling. -------------------------------------------------------- CHANGES Versions in Tools or Libraries: -------------------------------------------------------- -[.alpha]- Update Scintilla Library (SCI) version 5.1.4 (2021-11-08). -[.alpha]- Update Lexilla Library (LEX) version 5.1.3 (2021-11-08). -[.alpha]- Update grepWinNP3 (GRE) version 2.1.8.40 (2021-10-19). -[.alpha]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-10-19). --------------------------------------------------------- -[.###.#]- . -[.###.#]- . +[1130.1]- Update Scintilla Library (SCI) version 5.1.4 (2021-11-08). +[1130.1]- Update Lexilla Library (LEX) version 5.1.3 (2021-11-08). +[1130.1]- Update grepWinNP3 (GRE) version 2.1.8.40 (2021-10-19). +[1130.1]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-10-19). -------------------------------------------------------- FIXES: -------------------------------------------------------- [.###.#]- . -[.alpha]- Notification blocker on loading huge files. -[.alpha]- Heap corruption on retrieving text from combo box. -[.alpha]- Path_ToShortPathName() for grepWinNP3 startup. -[.alpha]- Path_StripPath(). --------------------------------------------------------- -[.###.#]- . -[.###.#]- . +[1130.1]- Small LongPath bugfixes. +[1130.1]- Notification blocker on loading huge files. +[1130.1]- Heap corruption on retrieving text from combo box. +[1130.1]- Path_ToShortPathName() for grepWinNP3 startup. +[1130.1]- Path_StripPath(). -------------------------------------------------------- REMOVED: 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 6f2c5fa6d..5e8d8532e 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -1129 +1130 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 4407743f8..01230a6c4 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 7096e666d..ce85b96a8 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,13 +8,13 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 21 -#define VERSION_REV 1129 -#define VERSION_BUILD 2 -#define SCINTILLA_VER 511 -#define LEXILLA_VER 511 +#define VERSION_REV 1130 +#define VERSION_BUILD 1 +#define SCINTILLA_VER 514 +#define LEXILLA_VER 513 #define ONIGURUMA_REGEX_VER 7.0.0 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 -#define UTHASH_VER 2.1.0 +#define UTHASH_VER 2.3.0 #define VERSION_PATCH beta #define VERSION_COMMIT_ID dkt1-amr