180415 release files

Maximus5 · Apr 16, 2018 · 997d70e · 997d70e
1 parent 82d6941
commit 997d70e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/PortableApps/App/AppInfo/appinfo.ini b/PortableApps/App/AppInfo/appinfo.ini
@@ -1,6 +1,6 @@
 [Version]
-PackageVersion=18.4.11.0
-DisplayVersion=180411
+PackageVersion=18.4.15.0
+DisplayVersion=180415
 
 [Format]
 Type=PortableApps.comFormat

diff --git a/Release/ConEmu/WhatsNew-ConEmu.txt b/Release/ConEmu/WhatsNew-ConEmu.txt
@@ -20,6 +20,17 @@ https://conemu.github.io/en/Whats_New.html
 -------------------------------------------
 
 
+2018.4.15
+* gh-172: Disable scrolling (mouse wheel and hotkeys) past lowest line.
+* gh-1509: Previous focused window is incorrectly restored to focus after ‘quake’ minimization.
+* gh-1511: ANSI: fix `\n` processing in emacs.
+* gh-1510: Fix for git hangs when Inject ConEmuHk.dll option is enabled (9bce8f14e regression).
+* gh-1512: Option ‘Restore to active monitor’ shall not override unchecked ‘Restore inactive window by hotkey’.
+* Show options ‘Restore inactive window by hotkey’ and ‘Restore to active monitor’ on the ‘Quake style’ page.
+* When ScrollBar is always shown (in settings) don't hide it in alternative (xterm) mode.
+* Improve OS information in About/SysInfo and log.
+
+
 2018.4.11
 * gh-1402: Workaround for \u23CE ⏎ character preceding every prompt in fish on CJK versions of Win10.
 * gh-1449: DefTerm: Support VS 2017 changes in debugging C# console applications.

diff --git a/src/ConEmu/version.h b/src/ConEmu/version.h
@@ -1,7 +1,7 @@
-// 180411
+// 180415
 #define MVV_1 18
 #define MVV_2 4
-#define MVV_3 11
+#define MVV_3 15
 #define MVV_4 0
 #define MVV_4a ""
 #undef MVV_git

diff --git a/src/Setup/Setupper/VersionI.h b/src/Setup/Setupper/VersionI.h
@@ -1,5 +1,5 @@
-#define CONEMUVERN 18,4,11,0
-#define CONEMUVERS "180411"
-#define CONEMUVERL L"180411"
-#define MSI86 "../ConEmu.180411.x86.msi"
-#define MSI64 "../ConEmu.180411.x64.msi"
+#define CONEMUVERN 18,4,15,0
+#define CONEMUVERS "180415"
+#define CONEMUVERL L"180415"
+#define MSI86 "../ConEmu.180415.x86.msi"
+#define MSI64 "../ConEmu.180415.x64.msi"
diff --git a/src/Setup/Version.wxi b/src/Setup/Version.wxi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
 
-  <?define Version = '$(var.MajorVersion).180.4110' ?>
-  <?define ConEmuVerS = '180411.$(var.Platform)' ?>
+  <?define Version = '$(var.MajorVersion).180.4150' ?>
+  <?define ConEmuVerS = '180415.$(var.Platform)' ?>
 
 </Include>