Add WebKitTools/TestResultServer/index.yaml to gitattributes to ignore for crlf conve...

* .gitattributes:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@56048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitattributes b/.gitattributes
index f6df8bbfcab46cb5302f829a6b2a1f66a528813f..8a6c64ba19a13f8350500958cd718164bf6e6faa 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -284,3 +284,4 @@ WebKitTools/WinLauncher/WinLauncher.h -crlf
 WebKitTools/WinLauncher/WinLauncher.vcproj -crlf
 WebKitTools/record-memory-win/main.cpp -crlf
 WebKitTools/record-memory-win/record-memory-win.vcproj -crlf
+WebKitTools/TestResultServer/index.yaml -crlf

diff --git a/ChangeLog b/ChangeLog
index de386b9bb7b40f6290dcf7bd724857e6e9f5dcf1..e5206f410b2e01aae7c1c45d82b6472d77b92dfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-16  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Add WebKitTools/TestResultServer/index.yaml to gitattributes to ignore for crlf conversion.
+
+        * .gitattributes:
+
 2010-03-12  Scott Byer  <scottbyer@chromium.org>
 
         Reviewed by David Levin.