# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1313956968 -3600
# Node ID 12a8279f116f6637310669447af23fc9b01e941f
# Parent  23e7f51386fd31f270c588f72648ba1944b0d883# Parent  c28ff466d00947c8969df3284b8c6a8aab806bd2
Re #341: Wrong default army size
 * Merge branch (should use bookmarks instead for short-lived branches)

diff -r 23e7f51386fd -r 12a8279f116f .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sun Aug 21 21:02:48 2011 +0100
@@ -0,0 +1,5 @@
+obj/*
+bin/*
+test-results/*
+IBBoard.WarFoundry.API.Tests.suo
+IBBoard.WarFoundry.API.Tests.pidb
\ No newline at end of file
diff -r 23e7f51386fd -r 12a8279f116f API/Savers/Xml/WarFoundryXmlFileSaverTests.cs
--- a/API/Savers/Xml/WarFoundryXmlFileSaverTests.cs	Sun Aug 14 01:19:12 2011 +0000
+++ b/API/Savers/Xml/WarFoundryXmlFileSaverTests.cs	Sun Aug 21 21:02:48 2011 +0100
@@ -41,12 +41,12 @@
 
 		protected override byte[] GetGameSystemContentBytes()
 		{
-			return StringManipulation.StringToBytes(@"<?xml version=""1.0"" encoding=""UTF-8""?><system xmlns=""http://ibboard.co.uk/warfoundry/system"" xmlns:cats=""http://ibboard.co.uk/warfoundry/cats"" id=""mocksystem"" name=""Mock Game System"" defaultArmySize=""0"" warn=""false"" allowAllies=""false""><categories /><sysStatsList defaultStats=""default""><sysStats id=""default"" /></sysStatsList></system>");
+			return StringManipulation.StringToBytes(@"<?xml version=""1.0"" encoding=""UTF-8""?><system xmlns=""http://ibboard.co.uk/warfoundry/system"" xmlns:cats=""http://ibboard.co.uk/warfoundry/cats"" id=""mocksystem"" name=""Mock Game System"" defaultArmySize=""1000"" warn=""true"" allowAllies=""false""><categories /><sysStatsList defaultStats=""default""><sysStats id=""default"" /></sysStatsList></system>");
 		}
 
 		protected override byte[] GetOtherGameSystemContentBytes()
 		{
-			return StringManipulation.StringToBytes(@"<?xml version=""1.0"" encoding=""UTF-8""?><system xmlns=""http://ibboard.co.uk/warfoundry/system"" xmlns:cats=""http://ibboard.co.uk/warfoundry/cats"" id=""otherSystem"" name=""Other System"" defaultArmySize=""0"" warn=""false"" allowAllies=""false""><categories /><sysStatsList defaultStats=""_"" /></system>");
+			return StringManipulation.StringToBytes(@"<?xml version=""1.0"" encoding=""UTF-8""?><system xmlns=""http://ibboard.co.uk/warfoundry/system"" xmlns:cats=""http://ibboard.co.uk/warfoundry/cats"" id=""otherSystem"" name=""Other System"" defaultArmySize=""1000"" warn=""true"" allowAllies=""false""><categories /><sysStatsList defaultStats=""_"" /></system>");
 		}
 
 		protected override byte[] GetArmyContentBytes ()
diff -r 23e7f51386fd -r 12a8279f116f IBBoard.WarFoundry.API.Tests.csproj
--- a/IBBoard.WarFoundry.API.Tests.csproj	Sun Aug 14 01:19:12 2011 +0000
+++ b/IBBoard.WarFoundry.API.Tests.csproj	Sun Aug 21 21:02:48 2011 +0100
@@ -105,6 +105,7 @@
     <Compile Include="API\Factories\Mock\MockRaceFactory.cs" />
     <Compile Include="API\MockRequirementFactory.cs" />
     <Compile Include="API\Factories\Requirement\Mock\MockRequirement.cs" />
+    <Compile Include="API\Savers\Xml\WarFoundryXmlFileSaverTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />