From: PilzAdam <pilzadam@minetest.net>
Date: Wed, 6 Mar 2013 20:34:39 +0000 (+0100)
Subject: Change libjson to libjsoncpp in .gitignore
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=aa77ee66c56f1f081b2d278da4a238ab2f5c9ff8;p=zefram%2Fminetest%2Fminetest_engine.git

Change libjson to libjsoncpp in .gitignore
---

diff --git a/.gitignore b/.gitignore
index 35303263..803d8cb2 100644
--- 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