Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma

2016-11-21 16:31:54 +02:00
parent 50d706c67b 145abe03f1
commit 82aa43cda3
16 changed files with 182 additions and 51 deletions
@@ -1488,7 +1488,6 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
    <None Include="packages.config" />
-    <None Include="Submarines\Aegir Mark II.sub" />
    <None Include="Submarines\Nehalennia.sub" />
    <None Include="Submarines\TutorialSub.sub" />
    <None Include="Submarines\Vellamo.sub" />