- Merged wbb3addons-gitIgnoreImprovements into master

diff --git a/.gitignore b/.gitignore
index 798c2fb7ee3e67154bca58590a2de086e1472eba..fec3b057256e42700dbab3a744f429fff99733b0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,19 @@
+# Linux\r
+*~ # backup files\r
 \r
+# Windows\r
+Thumbs.db\r
+\r
+# Visual Studio PHP\r
 *.sln\r
 *.phpproj\r
 *.puo\r
 *.suo\r
-*.project
\ No newline at end of file
+\r
+# Eclipse\r
+.settings/\r
+.project\r
+.buildpath\r
+\r
+# SVN\r
+.svn/\r