From 2f2425880b54debc81a97d43a36dd0cbcc089145 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 11 Feb 2020 13:47:38 +0200 Subject: [PATCH] Moved Docs Folder --- {doc => Build/doc}/KeyboardShortcuts.txt | 0 {doc => Build/doc}/Notepad3.txt | 0 {doc => Build/doc}/crypto/encryption-doc.txt | 0 {doc => Build/doc}/crypto/read_me.txt | 0 {doc => Build/doc}/uthash/.gitignore | 0 {doc => Build/doc}/uthash/ChangeLog.txt | 0 {doc => Build/doc}/uthash/Makefile | 0 {doc => Build/doc}/uthash/banner.png | Bin {doc => Build/doc}/uthash/banner.svg | 0 .../doc}/uthash/google315d692c9c632ed0.html | 0 {doc => Build/doc}/uthash/index.html | 0 {doc => Build/doc}/uthash/license.html | 0 {doc => Build/doc}/uthash/rss.png | Bin {doc => Build/doc}/uthash/styles.css | 0 {doc => Build/doc}/uthash/userguide.txt | 0 {doc => Build/doc}/uthash/utarray.txt | 0 {doc => Build/doc}/uthash/uthash-mini.png | Bin {doc => Build/doc}/uthash/uthash-mini.svg | 0 {doc => Build/doc}/uthash/uthash.png | Bin {doc => Build/doc}/uthash/utlist.txt | 0 {doc => Build/doc}/uthash/utringbuffer.txt | 0 {doc => Build/doc}/uthash/utstring.txt | 0 Versions/build.txt | 2 +- np3portableapp/_buildname.txt | 2 +- res/Notepad3.exe.manifest.conf | 4 ++-- src/VersionEx.h | 8 ++++---- 26 files changed, 8 insertions(+), 8 deletions(-) rename {doc => Build/doc}/KeyboardShortcuts.txt (100%) rename {doc => Build/doc}/Notepad3.txt (100%) rename {doc => Build/doc}/crypto/encryption-doc.txt (100%) rename {doc => Build/doc}/crypto/read_me.txt (100%) rename {doc => Build/doc}/uthash/.gitignore (100%) rename {doc => Build/doc}/uthash/ChangeLog.txt (100%) rename {doc => Build/doc}/uthash/Makefile (100%) rename {doc => Build/doc}/uthash/banner.png (100%) rename {doc => Build/doc}/uthash/banner.svg (100%) rename {doc => Build/doc}/uthash/google315d692c9c632ed0.html (100%) rename {doc => Build/doc}/uthash/index.html (100%) rename {doc => Build/doc}/uthash/license.html (100%) rename {doc => Build/doc}/uthash/rss.png (100%) rename {doc => Build/doc}/uthash/styles.css (100%) rename {doc => Build/doc}/uthash/userguide.txt (100%) rename {doc => Build/doc}/uthash/utarray.txt (100%) rename {doc => Build/doc}/uthash/uthash-mini.png (100%) rename {doc => Build/doc}/uthash/uthash-mini.svg (100%) rename {doc => Build/doc}/uthash/uthash.png (100%) rename {doc => Build/doc}/uthash/utlist.txt (100%) rename {doc => Build/doc}/uthash/utringbuffer.txt (100%) rename {doc => Build/doc}/uthash/utstring.txt (100%) diff --git a/doc/KeyboardShortcuts.txt b/Build/doc/KeyboardShortcuts.txt similarity index 100% rename from doc/KeyboardShortcuts.txt rename to Build/doc/KeyboardShortcuts.txt diff --git a/doc/Notepad3.txt b/Build/doc/Notepad3.txt similarity index 100% rename from doc/Notepad3.txt rename to Build/doc/Notepad3.txt diff --git a/doc/crypto/encryption-doc.txt b/Build/doc/crypto/encryption-doc.txt similarity index 100% rename from doc/crypto/encryption-doc.txt rename to Build/doc/crypto/encryption-doc.txt diff --git a/doc/crypto/read_me.txt b/Build/doc/crypto/read_me.txt similarity index 100% rename from doc/crypto/read_me.txt rename to Build/doc/crypto/read_me.txt diff --git a/doc/uthash/.gitignore b/Build/doc/uthash/.gitignore similarity index 100% rename from doc/uthash/.gitignore rename to Build/doc/uthash/.gitignore diff --git a/doc/uthash/ChangeLog.txt b/Build/doc/uthash/ChangeLog.txt similarity index 100% rename from doc/uthash/ChangeLog.txt rename to Build/doc/uthash/ChangeLog.txt diff --git a/doc/uthash/Makefile b/Build/doc/uthash/Makefile similarity index 100% rename from doc/uthash/Makefile rename to Build/doc/uthash/Makefile diff --git a/doc/uthash/banner.png b/Build/doc/uthash/banner.png similarity index 100% rename from doc/uthash/banner.png rename to Build/doc/uthash/banner.png diff --git a/doc/uthash/banner.svg b/Build/doc/uthash/banner.svg similarity index 100% rename from doc/uthash/banner.svg rename to Build/doc/uthash/banner.svg diff --git a/doc/uthash/google315d692c9c632ed0.html b/Build/doc/uthash/google315d692c9c632ed0.html similarity index 100% rename from doc/uthash/google315d692c9c632ed0.html rename to Build/doc/uthash/google315d692c9c632ed0.html diff --git a/doc/uthash/index.html b/Build/doc/uthash/index.html similarity index 100% rename from doc/uthash/index.html rename to Build/doc/uthash/index.html diff --git a/doc/uthash/license.html b/Build/doc/uthash/license.html similarity index 100% rename from doc/uthash/license.html rename to Build/doc/uthash/license.html diff --git a/doc/uthash/rss.png b/Build/doc/uthash/rss.png similarity index 100% rename from doc/uthash/rss.png rename to Build/doc/uthash/rss.png diff --git a/doc/uthash/styles.css b/Build/doc/uthash/styles.css similarity index 100% rename from doc/uthash/styles.css rename to Build/doc/uthash/styles.css diff --git a/doc/uthash/userguide.txt b/Build/doc/uthash/userguide.txt similarity index 100% rename from doc/uthash/userguide.txt rename to Build/doc/uthash/userguide.txt diff --git a/doc/uthash/utarray.txt b/Build/doc/uthash/utarray.txt similarity index 100% rename from doc/uthash/utarray.txt rename to Build/doc/uthash/utarray.txt diff --git a/doc/uthash/uthash-mini.png b/Build/doc/uthash/uthash-mini.png similarity index 100% rename from doc/uthash/uthash-mini.png rename to Build/doc/uthash/uthash-mini.png diff --git a/doc/uthash/uthash-mini.svg b/Build/doc/uthash/uthash-mini.svg similarity index 100% rename from doc/uthash/uthash-mini.svg rename to Build/doc/uthash/uthash-mini.svg diff --git a/doc/uthash/uthash.png b/Build/doc/uthash/uthash.png similarity index 100% rename from doc/uthash/uthash.png rename to Build/doc/uthash/uthash.png diff --git a/doc/uthash/utlist.txt b/Build/doc/uthash/utlist.txt similarity index 100% rename from doc/uthash/utlist.txt rename to Build/doc/uthash/utlist.txt diff --git a/doc/uthash/utringbuffer.txt b/Build/doc/uthash/utringbuffer.txt similarity index 100% rename from doc/uthash/utringbuffer.txt rename to Build/doc/uthash/utringbuffer.txt diff --git a/doc/uthash/utstring.txt b/Build/doc/uthash/utstring.txt similarity index 100% rename from doc/uthash/utstring.txt rename to Build/doc/uthash/utstring.txt diff --git a/Versions/build.txt b/Versions/build.txt index 353e6b1d5..517d20b25 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -3195 +3196 diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt index 4fad18a3b..463000ad2 100644 --- a/np3portableapp/_buildname.txt +++ b/np3portableapp/_buildname.txt @@ -1 +1 @@ -"RC1" +"RC" diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 4aaefce95..c44ccba08 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 RC1 + Notepad3 RC diff --git a/src/VersionEx.h b/src/VersionEx.h index ac76f5026..87e2fd656 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,12 +8,12 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 210 -#define VERSION_BUILD 3195 +#define VERSION_REV 211 +#define VERSION_BUILD 3196 #define SCINTILLA_VER 430 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 -#define VERSION_PATCH RC1 -#define VERSION_COMMIT_ID DKT1-AMR +#define VERSION_PATCH RC +#define VERSION_COMMIT_ID VENOM-PC