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

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e85d8289655c538ebaaf20ec31ea5027020335f5..2531fe4cdd2e34cad6c7b7a0541e283817f19ff2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,23 @@
+favicon.*
 .htconfig.php
 \#*
+include/jquery-1.4.2.min.js
+*.log
+*.out
+*.version*
+favicon.*
+home.html
+addon
+*~
+
+#ignore documentation, it should be newly built 
+doc/api
+
+#ignore reports, should be generted with every build
+report/
+
+#ignore config files from eclipse, we don't want IDE files in our repository
+.project
+.buildpath
+.externalToolBuilders
+.settings