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

This commit is contained in:
Joonas Rikkonen
2019-04-29 21:09:50 +03:00
parent 97c4e3019d
commit 67a0636470
14 changed files with 112 additions and 65 deletions
+1 -1
View File
@@ -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>