Merge pull request #2158 from annando/1512-vier-fonts

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 41ec42389f92291bf57d3eca9b2769cc00f0c4c4..3c0570c67d2e40d25558c941d25f8ff061486bae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,44 @@
-favicon.*
-.htconfig.php
-\#*
-include/jquery-1.4.2.min.js
-*.log
-*.out
-*.version*
-favicon.*
-home.html
+favicon.*\r
+.htconfig.php\r
+.htpreconfig.php\r
+\#*\r
+include/jquery-1.4.2.min.js\r
+*.log\r
+*.out\r
+*.version*\r
+favicon.*\r
+home.html\r
+addon\r
+*~\r
+robots.txt\r
+\r
+#ignore documentation, it should be newly built \r
+doc/api\r
+\r
+#ignore reports, should be generted with every build\r
+report/\r
+\r
+#ignore config files from eclipse, we don't want IDE files in our repository\r
+.project\r
+.buildpath\r
+.externalToolBuilders\r
+.settings\r
+#ignore OSX .DS_Store files \r
+.DS_Store\r
+\r
+/nbproject/private/\r
+\r
+#ignore smarty cache\r
+/view/smarty3/compiled/\r
+\r
+#ignore cache folders\r
+/privacy_image_cache/\r
+/photo/\r
+/proxy/\r
+nbproject\r
+\r
+#ignore vagrant dir\r
+.vagrant/\r
+\r
+#ignore local folder\r
+/local/\r