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

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 4c031abc08fc1d44a9a04f65570fa39735ec5d48
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 20:01:32 2010 +0000

    Teach git about ObjC files
    
    Fixes <http://webkit.org/b/36015>.
    
    Reviewed by Tim Hatcher.
    
    * .gitattributes: Set the diff attribute for .m and .mm files, and .h
    files in Mac-specific directories. This can be used to generate
    more-readable diffs of ObjC files.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitattributes b/.gitattributes
index 80386ae..f6df8bb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,19 @@
 # git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
 ChangeLog* merge=changelog
 
+# To enable smart diffing of ObjC[++] files, run the following commands:
+# git config diff.objcpp.xfuncname "^[-+ at a-zA-Z_].*$"
+# git config diff.objcppheader.xfuncname "^[@a-zA-Z_].*$"
+*.m diff=objc
+*.mm diff=objcpp
+mac/*.h diff=objcppheader
+*/mac/*.h diff=objcppheader
+*/*/mac/*.h diff=objcppheader
+objc/*.h diff=objcppheader
+*/objc/*.h diff=objcppheader
+*/*/objc/*.h diff=objcppheader
+WebKitTools/WebKitLauncher/*.h diff=objcppheader
+
 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln -crlf
 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj -crlf
 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops -crlf
diff --git a/ChangeLog b/ChangeLog
index e3b807a..64db3f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-11  Adam Roben  <aroben at apple.com>
+
+        Teach git about ObjC files
+
+        Fixes <http://webkit.org/b/36015>.
+
+        Reviewed by Tim Hatcher.
+
+        * .gitattributes: Set the diff attribute for .m and .mm files, and .h
+        files in Mac-specific directories. This can be used to generate
+        more-readable diffs of ObjC files.
+
 2010-03-09  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Unreviewed. Versioning for 1.1.23.

-- 
WebKit Debian packaging