projects / zefram / minetest / minetest_engine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b9512ca)
Change libjson to libjsoncpp in .gitignore
authorPilzAdam <pilzadam@minetest.net>
Wed, 6 Mar 2013 20:34:39 +0000 (21:34 +0100)
committerkwolekr <kwolekr@minetest.net>
Wed, 6 Mar 2013 22:09:28 +0000 (17:09 -0500)
.gitignore patch | blob | history

diff --git a/.gitignore b/.gitignore
index 3530326373badb4ed30c8ba0917d793651e4f999..803d8cb23cecb9ca371fd1d7d0b6c8cff8d6ff9b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 *bak*
 tags
 *.vim
+*.orig
+*.rej
 
 ## Non-static Minetest directories
 /bin/
@@ -41,7 +43,7 @@ src/cguittfont/libcguittfont.a
 src/cguittfont/cmake_install.cmake
 src/cguittfont/Makefile
 src/json/CMakeFiles/
-src/json/libjson.a
+src/json/libjsoncpp.a
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
Minetest engine