From db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 4 Aug 2010 11:41:34 +0100
Subject: Merge WebKit at r64523 : Initial merge by git.

Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
---
 WebKitLibraries/ChangeLog | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'WebKitLibraries')

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 0cd5a9e..5f626fd 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,24 @@
+2010-07-30  Adam Roben  <aroben@apple.com>
+
+        Roll our r64361 and r64363
+
+        We can't make these changes until QuartzCore.lib is included in
+        WebKitSupportLibrary.
+
+2010-07-30  Adam Roben  <aroben@apple.com>
+
+        Add WKCACFContext and related functions
+
+        Also added some functions used by WKCAImageQueue.
+
+        Fixes <http://webkit.org/b/43244>.
+
+        Reviewed by Sam Weinig.
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
 2010-07-27  Kinuko Yasuda  <kinuko@chromium.org>
 
         Reviewed by Ojan Vafai.
-- 
cgit v1.1