Merge branch 'master' of git://github.com/chrisforbes/OpenRA

2009-12-23 21:08:36 +13:00
parent af715b4a5e fffb39df52
commit 34a88b3c2e
15 changed files with 177 additions and 53 deletions
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -173,6 +173,7 @@
    <Compile Include="Traits\Fake.cs" />
    <Compile Include="Traits\Harvester.cs" />
    <Compile Include="Traits\Helicopter.cs" />
+    <Compile Include="Traits\Infantry.cs" />
    <Compile Include="Traits\Plane.cs" />
    <Compile Include="Traits\ProductionQueue.cs" />
    <Compile Include="Traits\RenderBuildingCharge.cs" />