Merge pull request #497 from zeroadam/feature/L10n

[friendica-addons.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100755 (executable)
new mode 100644 (file)
index 88dec63..39340a4
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,24 @@
-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
+favicon.*\r
+.htconfig.php\r
+\#*\r
+*.log\r
+*.out\r
+*.version*\r
+favicon.*\r
+*~\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