diff --git a/Build/Changes.txt b/Build/Changes.txt index 8f81d7cce..c10eb0053 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -28,11 +28,13 @@ NLS - (N)ew (L)anguage (S)trings (need for translation) ONI - (ONI)guruma Regex engine SCI - (SCI)ntilla Library UCD - (UCD)ARDET is an Encoding Detector Library +GRE - (GRE)pWinNP3 Search in Files Tool ===================================================== -Current NF Version 5.20.411.(build_#) (2020-04-11) +Current BETA Version 5.20.413.(build_#) (2020-04-13) ===================================================== + ----------------------------------------------------- NEW: ----------------------------------------------------- @@ -40,7 +42,7 @@ NEW: - "waifu2x" scaled std toolbar bitmaps. - Call Notepad3 with case-sensitive and dot-match-all flag (if applicable). - Add "Overlapping Search" in Find/Replace dialog window. -- Integration of "grepWinNP3", a Search Tool in files (v2.1.0.2). +- Integration of "grepWinNP3", a Search Tool in files (v2.1.0.4) (GRE). ----------------------------------------------------- CHANGES: @@ -52,16 +54,17 @@ CHANGES: ENHANCEMENT: ----------------------------------------------------- - -- "grepWinNP3": add "Dark mode" settings. -- "grepWinNP3": asynchronous search & replace version. +- "grepWinNP3": add "Dark mode" settings (GRE). +- "grepWinNP3": asynchronous search & replace version (GRE). - DPI awareness and multi monitor handling. ----------------------------------------------------- FIXES: ----------------------------------------------------- - +- View selection on wrapped long-lines vs. normalizing view. - Don't protect backslash (double'\\') for pattern argument. -- "grepWinNP3" ordered map of languages for selection box. +- "grepWinNP3" ordered map of languages for selection box (GRE). - Translatable error message format (msgbox). - DPI scaling window on display dependent. diff --git a/Version_RC.cmd b/Version_RC.cmd index 9f21c9858..d5fbbf7e9 100644 --- a/Version_RC.cmd +++ b/Version_RC.cmd @@ -1,6 +1,6 @@ @echo off setlocal -set _VERPATCH_=RC3 +set _VERPATCH_=RC2 echo."%_VERPATCH_%">.\np3portableapp\_buildname.txt Version -VerPatch "%_VERPATCH_%" endlocal diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..00750edc0 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +3 diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt index cac2b49e6..dffc957ee 100644 --- a/np3portableapp/_buildname.txt +++ b/np3portableapp/_buildname.txt @@ -1 +1 @@ -"NF" +BETA diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index b23e6c00d..f6e64b445 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 NF + Notepad3 BETA diff --git a/src/VersionEx.h b/src/VersionEx.h index abc69ca64..4085b1487 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,11 +9,11 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 413 -#define VERSION_BUILD 1 +#define VERSION_BUILD 3 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 -#define VERSION_PATCH NF -#define VERSION_COMMIT_ID nebukadn +#define VERSION_PATCH BETA +#define VERSION_COMMIT_ID dkt1-amr