From ae8e936194f35c41b5b071e2319540408bc71fcc Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Thu, 12 Mar 2020 17:52:51 +0100 Subject: [PATCH 1/2] + upd: Version files for update translation into zh_CN --- Build/Changes.txt | 2 +- Versions/build.txt | 2 +- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 86db58031..e61e9e31d 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ===================================================== -Current RC3 Version 5.20.311.(build_#) (2020-03-11) +Current RC3 Version 5.20.312.(build_#) (2020-03-12) // Version 5.20.3xx.x (xx March 2020) ===================================================== diff --git a/Versions/build.txt b/Versions/build.txt index b8626c4cf..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -4 +1 diff --git a/Versions/day.txt b/Versions/day.txt index b661fff6c..a1e0432c9 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -311 +312 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index f0d40f32e..b87753681 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC3 diff --git a/src/VersionEx.h b/src/VersionEx.h index ea99b77e3..909b8ed7d 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,8 +8,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 311 -#define VERSION_BUILD 4 +#define VERSION_REV 312 +#define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27 From 071d420a4e0972fb7bd96d9b87c191b59066a127 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Thu, 12 Mar 2020 18:05:00 +0100 Subject: [PATCH 2/2] + upd: Version files (conflict version) --- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 b87753681..a785ec24e 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC3 diff --git a/src/VersionEx.h b/src/VersionEx.h index 909b8ed7d..6219ac0b2 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 312 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27