Skip to content

Commit

Permalink
141004 release files
Browse files Browse the repository at this point in the history
  • Loading branch information
Maximus5 committed Oct 5, 2014
1 parent bd2e9a4 commit ef6661a
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 11 deletions.
4 changes: 2 additions & 2 deletions PortableApps/App/AppInfo/appinfo.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Version]
PackageVersion=14.10.2.0
DisplayVersion=141002
PackageVersion=14.10.4.0
DisplayVersion=141004

[Format]
Type=PortableApps.comFormat
Expand Down
8 changes: 8 additions & 0 deletions Release/ConEmu/WhatsNew-ConEmu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ Votes and awards (vote for ConEmu, if you please)
http://code.google.com/p/conemu-maximus5/wiki/Awards


2014.10.04
[*] Auto switch hovered tabs while dragging files from/to Far panel.
[*] Don't try to copy files from "C:\1\" to "C:\1\" (same src and dst folders).
[*] Issue 1740: D&D was not started from Far 1.75.
[*] When creating default tasks, show WinSDK version in the tab label.
[*] Autocreate VS (vcvarsall.bat) tasks for new configs.


2014.10.02
[*] Preparing for Windows 10.

Expand Down
4 changes: 2 additions & 2 deletions src/ConEmu/version.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 141002
// 141004
#define MVV_1 14
#define MVV_2 10
#define MVV_3 2
#define MVV_3 4
#define MVV_4 0
#define MVV_4a ""
#undef MVV_git
Expand Down
10 changes: 5 additions & 5 deletions src/Setup/Setupper/VersionI.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#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"
#define CONEMUVERN 14,10,4,0
#define CONEMUVERS "141004"
#define CONEMUVERL L"141004"
#define MSI86 "../ConEmu.141004.x86.msi"
#define MSI64 "../ConEmu.141004.x64.msi"
4 changes: 2 additions & 2 deletions src/Setup/Version.wxi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>

<?define Version = '$(var.MajorVersion).141.0020' ?>
<?define ConEmuVerS = '141002.$(var.Platform)' ?>
<?define Version = '$(var.MajorVersion).141.0040' ?>
<?define ConEmuVerS = '141004.$(var.Platform)' ?>

</Include>

0 comments on commit ef6661a

Please sign in to comment.