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

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:04:08 +03:00
parent f259748910
commit c73fe6e132
17 changed files with 340 additions and 63 deletions
@@ -391,6 +391,7 @@
<Content Include="$(MSBuildThisFileDirectory)Content\Items\Command\NavUI.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(MSBuildThisFileDirectory)Content\Items\Containers\DivingSuitLocker2.png" />
<Content Include="$(MSBuildThisFileDirectory)Content\Items\Door\door2.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>