diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:22 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:28 +0200 |
| commit | af05e4b2defde537f3b953a7dae0ef44fae225aa (patch) | |
| tree | 3f751014432b35df1cc2fd6fb976410e86b70e73 /data | |
| parent | 4415d95c503f083d871abaf84516f2b6487ecb60 (diff) | |
| parent | 81535f6277b66c869cda7125b2aeaf99e8078b92 (diff) | |
| download | minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.gz minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.bz2 minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.zip | |
Merge branch 'upstream/master'
Conflicts:
data/oerkki1.png
src/client.cpp
Diffstat (limited to 'data')
| -rw-r--r-- | data/oerkki1_damaged.png | bin | 0 -> 341 bytes |
| -rw-r--r-- | data/unknown_block.png | bin | 0 -> 582 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/data/oerkki1_damaged.png b/data/oerkki1_damaged.png Binary files differnew file mode 100644 index 000000000..9b777387c --- /dev/null +++ b/data/oerkki1_damaged.png diff --git a/data/unknown_block.png b/data/unknown_block.png Binary files differnew file mode 100644 index 000000000..a27cb8ca9 --- /dev/null +++ b/data/unknown_block.png |
