From aa77ee66c56f1f081b2d278da4a238ab2f5c9ff8 Mon Sep 17 00:00:00 2001
From: PilzAdam <pilzadam@minetest.net>
Date: Wed, 6 Mar 2013 21:34:39 +0100
Subject: [PATCH] Change libjson to libjsoncpp in .gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 353032637..803d8cb23 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