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 4415d95c50 81535f6277

commit af05e4b2de

54 changed files with 3333 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

View file

Binary file not shown.

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

BIN

data/unknown_block.png Normal file

View file

Binary file not shown.

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