Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into DevNewFeatures

This commit is contained in:
Rainer Kottenhoff 2019-10-31 11:37:07 +01:00
commit 05fa78cfed
6 changed files with 7 additions and 6 deletions

View File

@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
==================================================
Current BETA Version 5.19.1026.#(build) (2019-10-26)
Current BETA Version 5.19.1031.#(build) (2019-10-31)
==================================================
--------------------------------------------------
@ -47,6 +47,7 @@ NEW:
--------------------------------------------------
CHANGES:
--------------------------------------------------
- All *.RC files encoded as UTF-8 Signature
- New Notepad3 Icon (Notepad3 icon by Vexels.com designed by smanashova@gmail.com).
- Initial default big toolbar only for monitors > Full-HD.
- Copy instead of insert (filename, path, GUID).

View File

@ -1 +1 @@
2662
2663

View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.1027.2662"
version="5.19.1031.2663"
type="win32"
/>
<description>Notepad3 BETA</description>

View File

@ -74,7 +74,7 @@
#if defined(_MSC_VER)
#if (_MSC_VER == 1923)
#if(_MSC_FULL_VER >= 192328106)
#define VER_CPL MS Visual C++ 2019 v16.3.(3-6)
#define VER_CPL MS Visual C++ 2019 v16.3.(3-7)
#elif(_MSC_FULL_VER >= 192328105)
#define VER_CPL MS Visual C++ 2019 v16.3.(0-2)
#endif

View File

@ -7,8 +7,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 1027
#define VERSION_BUILD 2662
#define VERSION_REV 1031
#define VERSION_BUILD 2663
#define SCINTILLA_VER 420
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27