Updated changes and readme and version

diff --git a/CHANGES.txt b/CHANGES.txt
index 830f78384417a7a7860908533d53f6f66fabb0d7..889c6c7af9c7150327b77632e16816695f546667 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,16 @@
 C H A N G E S\r
 \r
+CasparCG 2.0.6 Stable (as compared to 2.0.4 Stable)\r
+===================================================\r
+\r
+General\r
+-------\r
+  o Allow for the server to work without Processing.AirSend.x86.dll to prevent a\r
+    possible GPL violation.\r
+  o Version bump to keep up with CasparCG Client version.\r
+\r
+\r
+\r
 CasparCG 2.0.4 Stable (as compared to 2.0.4 Beta 1)\r
 ===================================================\r
 \r

diff --git a/README.txt b/README.txt
index cfff38caf9428c65d5d740e298ebc322d223764d..15e17881fd41a6bcd2b03865486ce27a57f64884 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-CasparCG Server 2.0.4 Stable\r
+CasparCG Server 2.0.6 Stable\r
 ============================\r
 \r
 Thank you for your interest in CasparCG Server, a professional software used to\r
@@ -51,7 +51,7 @@ INSTALLATION
 \r
 1. Check that your system meets the requirements above.\r
 \r
-2. Unzip and place the "CasparCG Server 2.0.4" folder anywhere you like.\r
+2. Unzip and place the "CasparCG Server 2.0.6" folder anywhere you like.\r
 \r
 3. Install "Microsoft Visual C++ 2010 Redistributable Package" from\r
    http://www.microsoft.com/download/en/details.aspx?id=5555\r
@@ -68,7 +68,7 @@ INSTALLATION
 \r
 7. Start the "CasparCG_Server.exe" program and configure the settings.\r
 \r
-8. Connect to the Server from a client, such as the CasparCG Client 2.0.5\r
+8. Connect to the Server from a client, such as the CasparCG Client 2.0.6\r
    (available as a separate download.)\r
 \r
 \r

diff --git a/casparcg.sln b/casparcg.sln
index 695425a11dae80c07101e129f7a9f737b9d52c5d..bbbda09568c075fd79fb4a648cf6406b7ad6b177 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -1,6 +1,6 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 2012\r
+# Visual Studio 2010\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core\core.vcxproj", "{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell", "shell\shell.vcxproj", "{8C26C94F-8092-4769-8D84-DEA479721C5B}"\r

diff --git a/version.tmpl b/version.tmpl
index 25224d16b8a742b43fff2563d0d6f1370ac44f63..f4afcc6ae953e14007bfecb35a567c9ef47994d9 100644 (file)
--- a/version.tmpl
+++ b/version.tmpl
@@ -1,4 +1,4 @@
 #define CASPAR_GEN 2\r
 #define CASPAR_MAYOR 0\r
-#define CASPAR_MINOR 4\r
+#define CASPAR_MINOR 6\r
 #define CASPAR_TAG "Stable"\r