From 6b62cd2a6bc4c999d894c18608f9fc608547c5ed Mon Sep 17 00:00:00 2001
From: TimWolla <timwolla@arcor.de>
Date: Thu, 14 Jul 2011 19:27:31 +0200
Subject: [PATCH] Added Ignores for OS-X and Netbeans

---
 .gitignore | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fec3b05725..17ee7b3166 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,11 @@
 *~ # backup files
 
 # Windows
-Thumbs.db
+Thumbs.db # thumbnails
+
+# OS-X
+.DS_Store
+._* #thumbnails
 
 # Visual Studio PHP
 *.sln
@@ -15,5 +19,9 @@ Thumbs.db
 .project
 .buildpath
 
+# Netbeans
+nbproject/
+nbactions.xml
+
 # SVN
-.svn/
+.svn/ # svn folders
-- 
2.20.1