Merge remote-tracking branch 'notepad3_orig_rizone/Dev_LongPath' into Dev_LongPath

# Conflicts:
#	Build/Changes.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
This commit is contained in:
METANEOCORTEX\Kotti 2021-10-18 19:36:38 +02:00
commit b71f3902e9
4 changed files with 10 additions and 8 deletions

View File

@ -46,6 +46,7 @@ NEW:
CHANGES:
--------------------------------------------------------
[.###.#]- .
[1015.2]- Xperm.: Some more DynStrg refactorings and LongPath handling.
[1015.1]- Remove the max win version check for undocumented DarkMode UxTheme methods.
[1015.1]- DarkMode enable up to Win11 build 22471.
[1015.1]- SQL Lexer bright and dark mode highlight color enhanced.
@ -59,8 +60,8 @@ CHANGES:
--------------------------------------------------------
CHANGES Versions in Tools or Libraries:
--------------------------------------------------------
[1015.2]- Xperm.: Update Scintilla Library (SCI) version 5.1.3 (2021-09-29).
[.802.1]- Update Lexilla Library (LEX) version 5.1.2 (2021-07-26).
[.726.1]- Update Scintilla Library (SCI) version 5.1.1 (2021-07-26).
[.726.1]- Update grepWinNP3 (GRE) version 2.1.8.39 (2021-07-26).
[.702.5]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-06-23).
@ -68,6 +69,7 @@ CHANGES Versions in Tools or Libraries:
FIXES:
--------------------------------------------------------
[.###.#]- .
[1015.2]- Xperm.: Path_StripPath().
[1015.1]- SQL Lexer dark mode highlight default colors.
[1015.1]- Disabled menu items if settings file itself is locked by file change notification.
[.927.1]- Over paint annoying menu-bar bottom line.

View File

@ -1 +1 @@
1
2

View File

@ -3,8 +3,8 @@
<assemblyIdentity
name="Rizonesoft.Notepad3"
processorArchitecture="*"
version="5.21.1015.1"
version="5.21.1015.2"
type="win32"
/>
<description>Notepad3 beta</description>
<description>Notepad3 alpha</description>
</assembly>

View File

@ -9,12 +9,12 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 21
#define VERSION_REV 1015
#define VERSION_BUILD 1
#define SCINTILLA_VER 511
#define VERSION_BUILD 2
#define SCINTILLA_VER 513
#define LEXILLA_VER 511
#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 VERSION_PATCH beta
#define UTHASH_VER 2.3.0
#define VERSION_PATCH alpha
#define VERSION_COMMIT_ID dkt1-amr