200615 release files

priest671 · Jun 15, 2020 · c58b922 · c58b922
1 parent c7e20c8
commit c58b922
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/PortableApps/App/AppInfo/appinfo.ini b/PortableApps/App/AppInfo/appinfo.ini
@@ -1,6 +1,6 @@
 [Version]
-PackageVersion=20.6.4.0
-DisplayVersion=200604
+PackageVersion=20.6.15.0
+DisplayVersion=200615
 
 [Format]
 Type=PortableApps.comFormat

diff --git a/Release/ConEmu/WhatsNew-ConEmu.txt b/Release/ConEmu/WhatsNew-ConEmu.txt
@@ -20,6 +20,12 @@ https://conemu.github.io/en/Whats_New.html
 -------------------------------------------
 
 
+2020.6.15
+* gh-2127: Fix broken `-FontDir` command line option.
+* gh-2087: Fix unbalanced CoUninitialize call in ConEmu Panel Views plugin.
+* l10n: updated translations.
+
+
 2020.6.4
 * gh-2009: Don't register ttf files in the working directory.
 * StatusBar: Show negative (lesser than -255) process exit codes as hex. E.g. `example.exe:1234 exit code 0xC0000409`.

diff --git a/src/ConEmu/version.h b/src/ConEmu/version.h
@@ -1,7 +1,7 @@
-// 200604
+// 200615
 #define MVV_1 20
 #define MVV_2 6
-#define MVV_3 4
+#define MVV_3 15
 #define MVV_4 0
 #define MVV_4a ""
 #undef MVV_git

diff --git a/src/ConEmu/version_stage.h b/src/ConEmu/version_stage.h
@@ -4,4 +4,4 @@
 #define CEVS_PREVIEW  1
 #define CEVS_ALPHA    2
 
-#define ConEmuVersionStage CEVS_ALPHA
+#define ConEmuVersionStage CEVS_PREVIEW
diff --git a/src/Setup/Setupper/VersionI.h b/src/Setup/Setupper/VersionI.h
@@ -1,5 +1,5 @@
-#define CONEMUVERN 20,6,4,0
-#define CONEMUVERS "200604"
-#define CONEMUVERL L"200604"
-#define MSI86 "../ConEmu.200604.x86.msi"
-#define MSI64 "../ConEmu.200604.x64.msi"
+#define CONEMUVERN 20,6,15,0
+#define CONEMUVERS "200615"
+#define CONEMUVERL L"200615"
+#define MSI86 "../ConEmu.200615.x86.msi"
+#define MSI64 "../ConEmu.200615.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).200.6040' ?>
-  <?define ConEmuVerS = '200604.$(var.Platform)' ?>
+  <?define Version = '$(var.MajorVersion).200.6150' ?>
+  <?define ConEmuVerS = '200615.$(var.Platform)' ?>
 
 </Include>