diff --git a/Build/Changes.txt b/Build/Changes.txt index 74ac66367..8a17f100d 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -53,8 +53,8 @@ CHANGES: [.xxx.x]- [.915.2]- User configurable "Web Action" menu item names. [.825.1]- Update grepWinNP3 (GRE) version 2.1.3.28 (2020-08-25). -[.813.1]- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020-07-31). -[.818.1]- Update Scintilla Library (SCI) version 4.4.4+ (2020-09-18). +[.915.3]- Update Oniguruma Regex (ONI) engine version 6.9.6+ (2020-09-15). +[.915.3]- Update Scintilla Library (SCI) version 4.4.5 (2020-09-09). -------------------------------------------------------- FIXES: 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/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index b6da6b62b..76c7a4240 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -169,6 +169,8 @@ copy /B "%NP3_X64_DIR%\grepWinNP3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" :: --------------------------------------------------------------------------------------------------- +goto :SKIP_DLL + :: Only for "Notepad3Portable_DLL" version :: Copy all current "Scintilla.dll" files if exist %NP3_WIN32_DIR%\Scintilla.dll ( @@ -183,6 +185,8 @@ if exist %NP3_X64_DIR%\Scintilla.dll ( echo. \x64\Scintilla.dll does not exist ) +:SKIP_DLL + :: --------------------------------------------------------------------------------------------------- call :REPLACE "xxxVERSIONxxx" "%NP3_PORTAPP_INFO%_template.ini" "%VERSION%" "%NP3_PORTAPP_INFO%_tmp.ini" diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 5feabc0c1..659a24861 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 a1c20e005..bd4b41c07 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,8 +9,8 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 915 -#define VERSION_BUILD 2 -#define SCINTILLA_VER 444 +#define VERSION_BUILD 3 +#define SCINTILLA_VER 445 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11