(07016aa31) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:11:48 +03:00
parent e66501d96a
commit 68b3e2eb07
13 changed files with 154 additions and 292 deletions
@@ -496,6 +496,7 @@
    <Content Include="$(MSBuildThisFileDirectory)Content\Map\OutpostWall_C.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\Map\SubRearBow2.png" />
    <Content Include="$(MSBuildThisFileDirectory)Content\Map\Zones\Ice\Zone4BaseTexture.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>