Merge branch 'master' of git://github.com/friendica/friendica

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100644 (file)
new mode 100755 (executable)
index 41ec423..2531fe4
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,17 @@ include/jquery-1.4.2.min.js
 *.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