summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPilzAdam <pilzadam@minetest.net>2013-03-06 21:34:39 +0100
committerkwolekr <kwolekr@minetest.net>2013-03-06 17:09:28 -0500
commitaa77ee66c56f1f081b2d278da4a238ab2f5c9ff8 (patch)
tree1daf96d7f15aa78915cf2d2d90ad4c2513a86072 /.gitignore
parentb9512cab1b995e74c11b12139fe9320c02ff2060 (diff)
downloadminetest-aa77ee66c56f1f081b2d278da4a238ab2f5c9ff8.tar.gz
minetest-aa77ee66c56f1f081b2d278da4a238ab2f5c9ff8.tar.bz2
minetest-aa77ee66c56f1f081b2d278da4a238ab2f5c9ff8.zip
Change libjson to libjsoncpp in .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
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