"or" -> "||" in content_mapblock.cpp

[dragonfireclient.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ce00d585ed9ee5194fd8b81b0a99ab1f4ede0d19..1d89854f79b0f491d3a03e5e1d380b604b2ac1fb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
 map/*
 world/*
 CMakeFiles/*
@@ -9,6 +10,7 @@ src/jthread/CMakeFiles/*
 src/jthread/Makefile
 src/jthread/cmake_config.h
 src/jthread/cmake_install.cmake
+.*.swp
 minetest.conf
 bin/
 CMakeCache.txt
@@ -19,4 +21,8 @@ cmake_install.cmake
 src/jthread/libjthread.a
 debug.txt
 bin/debug.txt
-
+minetestmapper/map.png
+locale/
+src/lua/build/
+src/lua/CMakeFiles/
+*bak*