Add CRLF ignores.

diff --git a/.gitattributes b/.gitattributes
index 3f0a09f..3e39a50 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,8 @@
-*/config/conf.xml ident
-*/config/*.dist ident
+# Add tracking hash to config files
+/*/config/conf.xml  ident
+/*/config/*.dist    ident
+
+# Ignore CRLF
+framework/iCalendar/docs/examples/*             -crlf
+framework/iCalendar/tests/fixtures/*            -crlf
+framework/iCalendar/tests/fixtures/vTimezone/*  -crlf

diff --git a/.gitignore b/.gitignore
index c651b3e..b32b9a3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,13 @@ run-tests.log
 */config/*.txt
 
 # Application specific excludes
+ApertureToAnselExportPlugin/build/
+ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.pbxuser
+!ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/default.pbxuser
+ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.perspectivev3
+ApertureToAnselExportPlugin/*.pbxproject
+ApertureToAnselExportPlugin/Installer/*.pkg
+
 framework/Rdo/examples/Horde/Rdo/conf.php
 
 iPhoto2Ansel/build/
@@ -27,10 +34,3 @@ iPhoto2Ansel/iPhoto2Ansel.xcodeproj/*.pbxuser
 iPhoto2Ansel/iPhoto2Ansel.xcodeproj/*.perspectivev3
 iPhoto2Ansel/*.pbxproject
 iPhoto2Ansel/Installer/*.pkg
-
-ApertureToAnselExportPlugin/build/
-ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.pbxuser
-!ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/default.pbxuser
-ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.perspectivev3
-ApertureToAnselExportPlugin/*.pbxproject
-ApertureToAnselExportPlugin/Installer/*.pkg