diff options
| author | Sebastian Rühl <bahamada_basti@yahoo.de> | 2011-06-26 12:24:32 +0200 |
|---|---|---|
| committer | Sebastian Rühl <bahamada_basti@yahoo.de> | 2011-06-26 12:24:32 +0200 |
| commit | 9d09103e481c4979ebb0130a9dee6265d0d6223b (patch) | |
| tree | c1c89aa8868975537758fe77a2b174d8ae3e5ed3 /.gitignore | |
| parent | a80025c352fb91ff295423940b3ded22755b70f0 (diff) | |
| parent | 158b054e72582005d895f1ed0e1cb0c9b22a8e57 (diff) | |
| download | minetest-9d09103e481c4979ebb0130a9dee6265d0d6223b.tar.gz minetest-9d09103e481c4979ebb0130a9dee6265d0d6223b.tar.bz2 minetest-9d09103e481c4979ebb0130a9dee6265d0d6223b.zip | |
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
Conflicts:
.gitignore
CMakeLists.txt
data/heart.png
src/CMakeLists.txt
src/game.cpp
src/guiMainMenu.cpp
src/inventory.cpp
src/map.cpp
src/mapblock.cpp
src/mapnode.cpp
src/mapnode.h
src/materials.cpp
src/server.cpp
Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index ce00d585e..f0c372ab7 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ cmake_install.cmake src/jthread/libjthread.a debug.txt bin/debug.txt - +minetestmapper/map.png |