Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100644 (file)
new mode 100755 (executable)
index 10a7187..6302bc1
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,20 @@
+favicon.*
 .htconfig.php
 \#*
-wip/*
 include/jquery-1.4.2.min.js
 *.log
 *.out
 *.version*
-push*
+favicon.*
 home.html
+addon
+*~
+
+#ignore documentation, it should be newly built 
+doc/api
+
+#ignore config files from eclipse, we don't want IDE files in our repository
+.project
+.buildpath
+.externalToolBuilders
+.settings