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

2019-05-16 05:15:16 +03:00
parent b02565796a
commit 108e42edb0
32 changed files with 574 additions and 360 deletions
@@ -216,7 +216,7 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
-  <ItemGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
+  <ItemGroup Condition="$(Configuration.EndsWith('Linux'))">
    <None Include="Launch_BarotraumaServer">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>