From cc32e37b82240c2cf9d81c0d49fc8cff7f338528 Mon Sep 17 00:00:00 2001
From: Tim <t4im@users.noreply.github.com>
Date: Sun, 20 Sep 2015 16:31:29 +0200
Subject: [PATCH] merge upstream commit: Gitignore: Update to ignore additional
 ide/editors

---
 .gitignore | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 717f5fe0..ef02689c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,22 @@
-## Generic ignorable patterns and files
-*~
-.*.swp
-*bak*
-tags
-*.vim
-
 ## Files related to minetest development cycle
-*.patch
+/*.patch
+# GNU Patch reject file
+*.rej
+
+## Editors and Development environments
+*~
+*.swp
+*.bak*
+*.orig
+# Vim
+*.vim
+# Kate
+.*.kate-swp
+.swp.*
+# Eclipse (LDT)
+.project
+.settings/
+.buildpath
+.metadata
+# Idea IDE
+.idea/*