Merge branch 'master' into dedicated-server

Browse Source

# Conflicts:
#	BarotraumaClient/Source/GameSettings.cs
#	BarotraumaClient/Source/Screens/NetLobbyScreen.cs

...

This commit is contained in:

juanjp600

2017-06-23 10:21:02 -03:00

parent 3b343899c0 5d5923ab28

commit 1dc255bc2f

16 changed files with 288 additions and 92 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BarotraumaClient/freetype6.dll

BIN

Binary file not shown.