From 8eef6411717bd11d80c49b9ed717c8602a0ce8b5 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Fri, 20 Apr 2012 10:56:14 -0300
Subject: Fixes #4456: Filter more IDEs/OS junk in .gitignore

---
 .gitignore | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index edfede73b..f3cd105c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
-/engine/settings.php
 /.htaccess
-/.buildpath
-/.settings
-/.project
+/engine/settings.php
+
 /mod/*
 !/mod/blog/
 !/mod/bookmarks/
@@ -38,3 +36,30 @@
 !/mod/uservalidationbyemail/
 !/mod/zaudio/
 
+# Eclipse
+/.buildpath
+/.settings
+/.project
+
+# PHPStorm
+/.idea
+
+# NetBeans
+/nbproject
+/nb-configuration.xml
+
+# vim
+.*.sw[a-z]
+*.un~
+Session.vim
+
+# Textmate
+*.tmproj
+*.tmproject
+tmtags
+
+# OS junk
+.DS_Store
+._*
+Thumbs.db
+Desktop.ini
-- 
cgit v1.2.3