Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_L…

…exilla
Jasperrpc · Sep 29, 2020 · c5a81c5 · c5a81c5
2 parents 1c93721 + 14b3520
commit c5a81c5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/Build/Changes.txt b/Build/Changes.txt
@@ -84,6 +84,7 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.xxx.x]- 
+[.928.2]- Freezing of main wnd caused by mixed usage of Lexer Interfaces.
 [.928.1]- Setting new IFace5 Lexer (should fix line/stream comment toggle issue #2912).
 [.927.1]- Lexer file extensions maintained in standard config.
 [.927.1]- grepWin language switching (github.com/stefankueng/grepWin/issues/199) (GRE).

diff --git 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
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.928.1"
+    version="5.20.928.2"
     type="win32"
   />
   <description>Notepad3 beta</description>

diff --git a/src/VersionEx.h b/src/VersionEx.h
@@ -9,7 +9,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 928
-#define VERSION_BUILD 1
+#define VERSION_BUILD 2
 #define SCINTILLA_VER 445
 #define ONIGURUMA_REGEX_VER 6.9.5
 #define UCHARDET_VER 2018.09.27