Merge branch 'upstream/master'

Browse Source

Conflicts:
	data/oerkki1.png
	src/client.cpp

...

This commit is contained in:

Nils Dagsson Moskopp

2011-07-14 22:43:22 +02:00

parent 5146c826be 81535f6277

commit 3560f0de08

53 changed files with 3330 additions and 2841 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

data/oerkki1_damaged.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 341 B

BIN

data/unknown_block.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 582 B