Merge remote-tracking branch 'refs/remotes/barotrauma/master'

Browse Source

Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Screens/GameScreen.cs

...

This commit is contained in:

juanjp600

2016-09-26 17:03:14 -03:00

parent bc5ace4f53 790212a20b

commit 0ef813f189

32 changed files with 2293 additions and 1781 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

Subsurface/Barotrauma.csproj

+1455 -1455

File diff suppressed because it is too large Load Diff