# HG changeset patch # User IBBoard # Date 1314386048 -3600 # Node ID ec2b73de16baae40157132fda2efe05887645caa # Parent b3a47b712a8bf5f6268696db33e9b52d114bfd10# Parent d084446348f5f7f1ddf8ac2d46418837a2e7c21d * Merge branch (code already merged in Subversion, but Mercurial kept the branch) diff -r b3a47b712a8b -r ec2b73de16ba FrmNewArmy.cs diff -r b3a47b712a8b -r ec2b73de16ba IBBoard.WarFoundry.GUI.WinForms.csproj