(c15419d90) Changelog additions + merge fix

This commit is contained in:
Joonas Rikkonen
2019-04-08 19:18:20 +03:00
parent 4811ec796f
commit 3877c18d0c
6 changed files with 34 additions and 32 deletions
@@ -2,7 +2,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Barotrauma.Extensions;
namespace Barotrauma
{