Merge branch 'test' of github.com:kellyelton/OCTGN into test

totalgit · Aug 13, 2013 · 489185c · 489185c
2 parents db4eaeb + 4477236
commit 489185c
Show file tree

Hide file tree

Showing 22 changed files with 43 additions and 43 deletions.
diff --git a/deploy/currentversion.txt b/deploy/currentversion.txt
@@ -1,7 +1,7 @@
 <info>
   <release>
-    <version>3.1.62.171</version>
-    <installPath>download/OCTGN-Setup-3.1.62.171.exe</installPath>
+    <version>3.1.63.172</version>
+    <installPath>download/OCTGN-Setup-3.1.63.172.exe</installPath>
     <updatePath>download/update.zip</updatePath>
   </release>
 </info>
diff --git a/installer/Install.nsi b/installer/Install.nsi
@@ -7,20 +7,20 @@
 !include "GetVC.nsh"
 !include "WarningXpPage.nsdinc"
 
-Name "OCTGN 3.1.62.171"
-OutFile "OCTGN-Setup-3.1.62.171.exe"
+Name "OCTGN 3.1.63.172"
+OutFile "OCTGN-Setup-3.1.63.172.exe"
 ShowInstDetails show
 LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
 
 ; Version Information
-VIProductVersion "3.1.62.171"
+VIProductVersion "3.1.63.172"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "OCTGN"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "A tabletop engine"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "OCTGN"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" ""
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "OCTGN release 3"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "3.1.62.171"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "3.1.63.172"
 
 ; Make plugin directory same as script
 !addplugindir .

diff --git a/nuget/Octgn.Library.nuspec b/nuget/Octgn.Library.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>Octgn.Library</id>
-        <version>3.1.62.172</version>
+        <version>3.1.63.172</version>
         <title>Octgn Library</title>
         <authors>Kelly Elton</authors>
         <owners />

diff --git a/octgnFX/Octgn.Core/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Core/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.DataNew/Properties/AssemblyInfo.cs b/octgnFX/Octgn.DataNew/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.Library/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Library/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.LobbyServer/Properties/AssemblyInfo.cs b/octgnFX/Octgn.LobbyServer/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.Online.Client/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Online.Client/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.Online.Data/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Online.Data/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.Online.GameService/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Online.GameService/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.Online.StandAloneServer/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Online.StandAloneServer/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.Online.Test/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Online.Test/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.ProxyGenerator/Properties/AssemblyInfo.cs b/octgnFX/Octgn.ProxyGenerator/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.ReleasePusher/Properties/AssemblyInfo.cs b/octgnFX/Octgn.ReleasePusher/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.Server/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Server/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.Test/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Test/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn.Tools.Proxytest/Properties/AssemblyInfo.cs b/octgnFX/Octgn.Tools.Proxytest/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Octgn/CurrentReleaseVersion.txt b/octgnFX/Octgn/CurrentReleaseVersion.txt
@@ -1 +1 @@
-3.1.62.171
+3.1.63.172
diff --git a/octgnFX/Octgn/CurrentVersion.txt b/octgnFX/Octgn/CurrentVersion.txt
@@ -1 +1 @@
-3.1.62.172
+3.1.63.172
diff --git a/octgnFX/Octgn/Properties/AssemblyInfo.cs b/octgnFX/Octgn/Properties/AssemblyInfo.cs
@@ -43,5 +43,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/Skylabs.Lobby/Properties/AssemblyInfo.cs b/octgnFX/Skylabs.Lobby/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.172")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.172")]
diff --git a/octgnFX/o8build/Properties/AssemblyInfo.cs b/octgnFX/o8build/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.62.172")]
-[assembly: AssemblyFileVersion("3.1.62.1728")]
+[assembly: AssemblyVersion("3.1.63.172")]
+[assembly: AssemblyFileVersion("3.1.63.1728")]