External merge resolve of #1566

Browse Source

Merge branch 'spain' of https://github.com/r3versi/Unciv into r3versi-spain

...

This commit is contained in:

Yair Morgenstern

2019-12-29 17:56:05 +02:00

parent 7b8042ac8b

commit 006b2d7690

27 changed files with 240 additions and 52 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

android/Images/NationIcons/Spain.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

android/Images/UnitIcons/Conquistador.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

android/Images/UnitIcons/Tercio.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB