Merge pull request #53 from Neerti/7/28/2015_more_git_magic

Browse Source

Updates first z-level map, now with mess merge conflict.

...

This commit is contained in:

Neerti

2015-07-28 04:04:55 -04:00

parent adaf75540a 33388c67ff

commit 265e53e0d6

1 changed files with 643 additions and 495 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

maps/colony-1.dmm

+643 -495

File diff suppressed because it is too large Load Diff