# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1314385888 -3600
# Node ID b3a47b712a8bf5f6268696db33e9b52d114bfd10
# Parent  c47094612bacb91d8659739ccc61b1648bf5584e# Parent  9d17b4674f6efd50758ac25cdd1c61d7cf0115e1
 * Merge branch (code already merged in Subversion, but Mercurial kept the branch)

diff -r c47094612bac -r b3a47b712a8b FrmNewArmy.cs
diff -r c47094612bac -r b3a47b712a8b IBBoard.WarFoundry.GUI.WinForms.csproj