aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-06-27 06:56:26 -0700
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-06-27 06:56:26 -0700
commitf37a3a84fafb91bcfc109fed95aa6d42726f1bf7 (patch)
treecde1e5f47f191beb4a9cefcd87872aef53b5fcec /.gitignore
parente261cc9e8fa67c9020fa0a82bd1a7041ecd351a0 (diff)
parent13cf5425db613dc0a4323c87a4988bb18fb87aca (diff)
downloadminetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.gz
minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.bz2
minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.zip
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ee3aa43c9..f0c372ab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
map/*
+world/*
CMakeFiles/*
src/CMakeFiles/*
src/Makefile
@@ -17,4 +18,5 @@ Makefile
cmake_install.cmake
src/jthread/libjthread.a
debug.txt
+bin/debug.txt
minetestmapper/map.png