diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-22 07:48:22 +0200 |
|---|---|---|
| committer | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-22 07:48:22 +0200 |
| commit | 7c1ea34baf1560cf8757e95f740e3277afdd2ba2 (patch) | |
| tree | de25d3deff5b252e154719c6d1abae944d32a749 /data | |
| parent | 3d53cc2c1122741df2dd4506ca5e7e188824b5c3 (diff) | |
| parent | 909075da5c656e42ea6b8c98c9c8ceb11c01fcc1 (diff) | |
| download | minetest-7c1ea34baf1560cf8757e95f740e3277afdd2ba2.tar.gz minetest-7c1ea34baf1560cf8757e95f740e3277afdd2ba2.tar.bz2 minetest-7c1ea34baf1560cf8757e95f740e3277afdd2ba2.zip | |
Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
src/CMakeLists.txt
Diffstat (limited to 'data')
| -rw-r--r-- | data/firefly.png | bin | 150 -> 116 bytes |
| -rw-r--r-- | data/unknown_block.png | bin | 582 -> 287 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/data/firefly.png b/data/firefly.png Binary files differindex d5a444b03..40df7fa1c 100644 --- a/data/firefly.png +++ b/data/firefly.png diff --git a/data/unknown_block.png b/data/unknown_block.png Binary files differindex a27cb8ca9..8a8e0109c 100644 --- a/data/unknown_block.png +++ b/data/unknown_block.png |
