Merge remote branch 'origin/master'
[oweals/minetest.git] / .gitignore
index 1ebd43e0d913b1a46290def8ab41d7a7550ce8f7..50d7c43e0fd588e43d9204978d584efba46ede10 100644 (file)
@@ -37,6 +37,7 @@ 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/
@@ -45,6 +46,8 @@ src/cguittfont/cmake_install.cmake
 src/cguittfont/Makefile
 src/json/CMakeFiles/
 src/json/libjsoncpp.a
+src/sqlite/CMakeFiles/*
+src/sqlite/libsqlite3.a
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake