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

[barraclough at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit f68fe33042560a761758def9266dee3634e6c7fe
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 01:32:11 2010 +0000

    erk, demangle the ChangeLog!
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52777 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ad13ad7..980cd70 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,16 +1,3 @@
-2010-01-04  Mark Rowe  <mrowe at apple.com>
-
-        Reviewed by Sam Weinig.
-
-        https://bugs.webkit.org/show_bug.cgi?id=33163
-        Use WTF's string hashing functions from StringImpl.
-
-        * ForwardingHeaders/wtf/StringHashFunctions.h: Added.
-        * platform/text/StringHash.h:
-        * platform/text/StringImpl.h:
-        (WebCore::StringImpl::computeHash):
-
-<<<<<<< .mine
 2010-01-04  Gavin Barraclough <barraclough at apple.com>
 
         Reviewed by Sam Weinig.
@@ -23,7 +10,6 @@
         * platform/text/StringImpl.h:
         (WebCore::StringImpl::computeHash):
 
-=======
 2010-01-04  Jon Honeycutt  <jhoneycutt at apple.com>
 
         MSAA: <select> elements should broadcast value change events
@@ -87,7 +73,6 @@
         * WebCore.vcproj/WebCore.vcproj:
         * inspector/front-end/InspectorControllerStub.js: Removed.
 
->>>>>>> .r52775
 2010-01-04  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix, add a couple include dirs to the build.

-- 
WebKit Debian packaging