fix mergeconflicts

Browse source

...

This commit is contained in:

tchncs 2016-05-02 10:16:25 +02:00

parent 0fc11da8c7 acafe5ca86

commit f4fc4294b7

22 changed files with 824 additions and 405 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

BIN

mods/default/textures/default_grass.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 777 B After Width:  |  Height:  |  Size: 377 B

BIN

mods/default/textures/default_grass_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 490 B After Width:  |  Height:  |  Size: 771 B

BIN

mods/default/textures/heart.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 293 B After Width:  |  Height:  |  Size: 14 KiB