Fixes merge conflicts

Browse Source

...

This commit is contained in:

Shadowlight213

2016-05-27 15:36:56 -07:00

parent 4797ea3ba8 2cfb2d8eed

commit ce01058e7c

544 changed files with 16363 additions and 9350 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

code/modules/client/client defines.dm → code/modules/client/client_defines.dm

code/modules/client/client procs.dm → code/modules/client/client_procs.dm