Friendicaland

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index bb8f88f759bca82802fb57c4393410a3fcbd1438..34675be90bf147a6cf85f15b3e060271802ecf40 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,25 @@
 favicon.*
 .htconfig.php
 \#*
-wip/*
 include/jquery-1.4.2.min.js
 *.log
 *.out
 *.version*
-push*
-langup
-merge
+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
+
+view/theme/smoothly
\ No newline at end of file