(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 deletions
@@ -243,6 +243,7 @@
    <None Include="System.Xml.Linq.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
+    <None Include="barotrauma.icns" />
  </ItemGroup>
  <ItemGroup />
  <Import Project="ClientCode.projitems" Label="Shared" />