MutexedQueue inherits must use std::deque instead of std::list

[minetest.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 803d8cb23cecb9ca371fd1d7d0b6c8cff8d6ff9b..f12c41fc548857716bd7b1f4d049f8e644254d56 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,8 @@ tags
 /games/*
 !/games/minimal/
 /cache/
-/textures/
+/textures/*
+!/textures/base/
 /sounds/
 /mods/*
 !/mods/minetest/
@@ -25,17 +26,30 @@ tags
 minetest.conf
 debug.txt
 
+## Doxygen files
+doc/Doxyfile
+doc/html/
+doc/doxygen_*
+
 ## Build files
 CMakeFiles/*
 src/CMakeFiles/*
 src/Makefile
+src/android_version.h
 src/cmake_config.h
+src/cmake_config_githash.h
 src/cmake_install.cmake
+src/script/CMakeFiles/*
+src/script/common/CMakeFiles/*
+src/script/cpp_api/CMakeFiles/*
+src/script/lua_api/CMakeFiles/*
+src/util/CMakeFiles/*
 src/jthread/CMakeFiles/*
 src/jthread/Makefile
 src/jthread/cmake_config.h
 src/jthread/cmake_install.cmake
 src/jthread/libjthread.a
+src/json/libjson.a
 src/lua/build/
 src/lua/CMakeFiles/
 src/cguittfont/CMakeFiles/
@@ -44,10 +58,30 @@ src/cguittfont/cmake_install.cmake
 src/cguittfont/Makefile
 src/json/CMakeFiles/
 src/json/libjsoncpp.a
+src/sqlite/CMakeFiles/*
+src/sqlite/libsqlite3.a
+src/client/CMakeFiles/
+src/network/CMakeFiles/
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
 Makefile
 cmake_install.cmake
 locale/
+*.cbp
+*.layout
+*.o
+
+## Android build files
+build/android/assets
+build/android/bin
+build/android/Debug
+build/android/deps
+build/android/gen
+build/android/jni/src
+build/android/libs
+build/android/obj
+build/android/path.cfg
+build/android/AndroidManifest.xml
+timestamp