141002 release files

Maximus5 · Oct 2, 2014 · 7022720 · 7022720
1 parent a3df4f8
commit 7022720
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/PortableApps/App/AppInfo/appinfo.ini b/PortableApps/App/AppInfo/appinfo.ini
@@ -1,6 +1,6 @@
 [Version]
-PackageVersion=14.10.1.0
-DisplayVersion=141001
+PackageVersion=14.10.2.0
+DisplayVersion=141002
 
 [Format]
 Type=PortableApps.comFormat

diff --git a/Release/ConEmu/WhatsNew-ConEmu.txt b/Release/ConEmu/WhatsNew-ConEmu.txt
@@ -12,6 +12,10 @@ Votes and awards (vote for ConEmu, if you please)
 http://code.google.com/p/conemu-maximus5/wiki/Awards
 
 
+2014.10.02
+[*] Preparing for Windows 10.
+
+
 2014.10.01
 [*] ConEmuPlugin was rewritten using classes (Far versioning).
 [*] Don't activate Far Panels while Ctrl+LClick in Far Editor window.

diff --git a/src/ConEmu/version.h b/src/ConEmu/version.h
@@ -1,7 +1,7 @@
-// 141001
+// 141002
 #define MVV_1 14
 #define MVV_2 10
-#define MVV_3 1
+#define MVV_3 2
 #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 14,10,1,0
-#define CONEMUVERS "141001"
-#define CONEMUVERL L"141001"
-#define MSI86 "../ConEmu.141001.x86.msi"
-#define MSI64 "../ConEmu.141001.x64.msi"
+#define CONEMUVERN 14,10,2,0
+#define CONEMUVERS "141002"
+#define CONEMUVERL L"141002"
+#define MSI86 "../ConEmu.141002.x86.msi"
+#define MSI64 "../ConEmu.141002.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).141.0010' ?>
-  <?define ConEmuVerS = '141001.$(var.Platform)' ?>
+  <?define Version = '$(var.MajorVersion).141.0020' ?>
+  <?define ConEmuVerS = '141002.$(var.Platform)' ?>
 
 </Include>