From 641d178248510652353d0b1ffc041609074a7274 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 11 Oct 2016 12:49:01 +0200
Subject: [PATCH] include/zrcola.h >> include/version.h

---
 ZRCola.sln                         |   2 +-
 ZRCola/ZRCola.rc                   | Bin 5416 -> 5418 bytes
 ZRCola/stdafx.h                    |   2 +-
 ZRColaCompile/ZRColaCompile.rc     | Bin 3266 -> 3268 bytes
 ZRColaCompile/stdafx.h             |   2 +-
 ZRColaInstall/ZRColaInstall.rc     | Bin 4070 -> 4072 bytes
 ZRColaUtils.sln                    |   2 +-
 include/MSIBuildCfg.mak            | Bin 12362 -> 12364 bytes
 include/UpdaterCfg.h               |   2 +-
 include/{zrcola.h => version.h}    |  10 +++++-----
 lib/libZRCola/res/libZRCola.rc     | Bin 3282 -> 3284 bytes
 lib/libZRCola/src/stdafx.h         |   2 +-
 lib/libZRColaUI/res/libZRColaUI.rc | Bin 3282 -> 3284 bytes
 lib/libZRColaUI/src/stdafx.h       |   2 +-
 14 files changed, 12 insertions(+), 12 deletions(-)
 rename include/{zrcola.h => version.h} (84%)

diff --git a/ZRCola.sln b/ZRCola.sln
index cf48daa..8913c7f 100644
--- a/ZRCola.sln
+++ b/ZRCola.sln
@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\bu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFEBC17E-C840-4507-BDE6-1EF5B52DDCC5}"
 	ProjectSection(SolutionItems) = preProject
-		include\zrcola.h = include\zrcola.h
+		include\version.h = include\version.h
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\build\libZRCola.vcxproj", "{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}"
diff --git a/ZRCola/ZRCola.rc b/ZRCola/ZRCola.rc
index 2b2fbf338302323dac9988edf71357611a7eba61..9cff780506a7f13c5999e36cce6fa0644b3a7906 100644
GIT binary patch
delta 24
fcmZ3XwMuJ(0dE;YDnk)NF+(OpK11F{>$f5RTqOr*

delta 22
dcmZ3bwL)ux0e2Nc5koRVK0^*e;zrxIA^=ak2J8R;

diff --git a/ZRCola/stdafx.h b/ZRCola/stdafx.h
index 31cdc2d..63caac8 100644
--- a/ZRCola/stdafx.h
+++ b/ZRCola/stdafx.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../include/zrcola.h"
+#include "../include/version.h"
 #include "zrcolaabout.h"
 #include "zrcolaapp.h"
 #include "zrcolachrcatpnl.h"
diff --git a/ZRColaCompile/ZRColaCompile.rc b/ZRColaCompile/ZRColaCompile.rc
index bc25a8cc9d1668ae9f389cda195298b0cbb6c29f..a8e34871dd6251aaddf15278c3c24d523106d410 100644
GIT binary patch
delta 24
fcmX>kc|>x80dE;YDnk)NF+(OpK11F{>vkRhT@eQh

delta 22
dcmX>ic}Q}C0e2Nc5koRVK0^*e;zrwc9sp2;29N*%

diff --git a/ZRColaCompile/stdafx.h b/ZRColaCompile/stdafx.h
index 27aa835..1aab67f 100644
--- a/ZRColaCompile/stdafx.h
+++ b/ZRColaCompile/stdafx.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../include/zrcola.h"
+#include "../include/version.h"
 #include "dbsource.h"
 
 #include <zrcola/language.h>
diff --git a/ZRColaInstall/ZRColaInstall.rc b/ZRColaInstall/ZRColaInstall.rc
index 39e4be9fb2819c1d785a5efa2403ca056862eabc..c20df6451eff7a381f384b9711e7d6ac1da2be01 100644
GIT binary patch
delta 24
fcmaDR|3ZF(0dE;YDnk)NF+(OpK11F{>(%@KWZVaa

delta 22
dcmaDM|4e>@0e2Nc5koRVK0^*e;zrxm`~X*{2MYiI

diff --git a/ZRColaUtils.sln b/ZRColaUtils.sln
index 19cb034..7907dc7 100644
--- a/ZRColaUtils.sln
+++ b/ZRColaUtils.sln
@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{ECE3F336-FFD2-41EE-AD8F-17BD7472BDCB}"
 	ProjectSection(SolutionItems) = preProject
-		include\zrcola.h = include\zrcola.h
+		include\version.h = include\version.h
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaCompile", "ZRColaCompile\ZRColaCompile.vcxproj", "{87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}"
diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak
index 084a7ac5a5e9920785ef811ee7f389036123963c..740904216b743f59d836c86ada2db6a268d38598 100644
GIT binary patch
delta 26
icmX?=a3*2H5?<aihE#?khGK?HhJ1#+&Fgt*D**t6X$bcK

delta 24
gcmX?;a4KQL5?<~qh9ZV!hJ1z`hQ!Sqd1osD0CeLBd;kCd

diff --git a/include/UpdaterCfg.h b/include/UpdaterCfg.h
index 8cdc372..3d1bbc5 100644
--- a/include/UpdaterCfg.h
+++ b/include/UpdaterCfg.h
@@ -1,4 +1,4 @@
-#include "zrcola.h"
+#include "version.h"
 
 //
 // Update server(s)
diff --git a/include/zrcola.h b/include/version.h
similarity index 84%
rename from include/zrcola.h
rename to include/version.h
index a09c32b..7476c1f 100644
--- a/include/zrcola.h
+++ b/include/version.h
@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define ZRCOLA_VERSION          0x01ff1300
+#define ZRCOLA_VERSION          0x01ff1400
 
 //
 // Product version by components
@@ -33,26 +33,26 @@
 //
 #define ZRCOLA_VERSION_MAJ      1
 #define ZRCOLA_VERSION_MIN      255
-#define ZRCOLA_VERSION_REV      19
+#define ZRCOLA_VERSION_REV      20
 #define ZRCOLA_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define ZRCOLA_VERSION_STR      "2.0-beta10"
+#define ZRCOLA_VERSION_STR      "2.0-beta11"
 #define ZRCOLA_BUILD_YEAR_STR   "2016"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define ZRCOLA_VERSION_INST     "1.255.19"
+#define ZRCOLA_VERSION_INST     "1.255.20"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define ZRCOLA_VERSION_GUID     "{DD261422-947E-4BB4-BCCE-8528EEEAD8C0}"
+#define ZRCOLA_VERSION_GUID     "{C949BB90-B6B2-4268-95DA-0C4533595E1A}"
 
 //
 // The product vendor and application name for configuration keeping.
diff --git a/lib/libZRCola/res/libZRCola.rc b/lib/libZRCola/res/libZRCola.rc
index e9eab8653c82d460e458084e4cf1663f40bbb5bc..d14dab3a0c52aa6a847e09e946dc5bfcfd7c7051 100644
GIT binary patch
delta 24
fcmca4c|~%918*5aDnk)NF+(OpK11F{?{*#lVNnN5

delta 22
dcmca2c}a4D19ufe5koRVK0^*e;zr+g9spEi2G9Ti

diff --git a/lib/libZRCola/src/stdafx.h b/lib/libZRCola/src/stdafx.h
index 9a338c4..dc4a349 100644
--- a/lib/libZRCola/src/stdafx.h
+++ b/lib/libZRCola/src/stdafx.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../../../include/zrcola.h"
+#include "../../../include/version.h"
 
 #include "../include/zrcola/character.h"
 #include "../include/zrcola/language.h"
diff --git a/lib/libZRColaUI/res/libZRColaUI.rc b/lib/libZRColaUI/res/libZRColaUI.rc
index 1f3791f18d318ab8f21b5e6365c3409093a4f1eb..8403e2b729219f6353dfbe2efdd90b60942b0047 100644
GIT binary patch
delta 24
fcmca4c|~%918*5aDnk)NF+(OpK11F{?{*#lVNnN5

delta 22
dcmca2c}a4D19ufe5koRVK0^*e;zr+g9spEi2G9Ti

diff --git a/lib/libZRColaUI/src/stdafx.h b/lib/libZRColaUI/src/stdafx.h
index 09f9f87..a5c55ca 100644
--- a/lib/libZRColaUI/src/stdafx.h
+++ b/lib/libZRColaUI/src/stdafx.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../../../include/zrcola.h"
+#include "../../../include/version.h"
 #include "../include/zrcolaui/chargroup.h"
 #include "../include/zrcolaui/keyboard.h"