(221f9f2a6) Merge branch 'dev' into capitalizationfixes

2019-06-04 15:38:31 +03:00
parent f797235bfd
commit e592c49fa8
22 changed files with 97 additions and 72 deletions
@@ -9,7 +9,6 @@ namespace Barotrauma
        private GUIListBox listBox;

        private XElement configElement;
-        private RectTransform parent;

        private float scrollSpeed;