[MIRROR] Fixes master (#409)

Browse Source

* Fixes master

* adds missing #endif

* Revert "adds missing #endif"

This reverts commit 6e6124ed64ec7593e27a31393b54971c5050a5aa.

* master fix

* removes .rej

...

This commit is contained in:

CitadelStationBot

2017-04-15 14:44:00 -05:00

committed by TalkingCactus

parent 5ba6a5e768

commit f510bf2a03

1 changed files with 611 additions and 611 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/game/atoms_movable.dm

+611 -611

File diff suppressed because it is too large Load Diff