[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 12c06763597a86c7b09a53ff35b33f57f82d357e
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 08:53:21 2010 +0000

    Add WebKitTools/TestResultServer/index.yaml to gitattributes to ignore for crlf conversion.
    
    * .gitattributes:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitattributes b/.gitattributes
index f6df8bb..8a6c64b 100644
--- 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 de386b9..e5206f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-16  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Add WebKitTools/TestResultServer/index.yaml to gitattributes to ignore for crlf conversion.
+
+        * .gitattributes:
+
 2010-03-12  Scott Byer  <scottbyer at chromium.org>
 
         Reviewed by David Levin.

-- 
WebKit Debian packaging