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

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index cbdf03673bbdf269bb4063bf2c3507859da7d2c3..358114a44481357fd2f6e4a8bb4f134fcde35b85 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,27 @@
-favicon.*
-.htconfig.php
-\#*
-include/jquery-1.4.2.min.js
-*.log
-*.out
-*.version*
-favicon.*
-home.html
-addon
+favicon.*\r
+.htconfig.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
+\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/
\ No newline at end of file