From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 13 May 2011 16:23:25 +0100
Subject: Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
---
 Source/ThirdParty/ANGLE/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Source/ThirdParty')

diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index 4246845..bd993b7 100644
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-17  Dan Bernstein  <mitz@apple.com>
+
+        Rubber-stamped by Mark Rowe.
+
+        Update xcodeproj svn:ignore to include xcuserdata.
+
+        * ANGLE.xcodeproj: Modified property svn:ignore.
+        * src/build_angle.xcodeproj: Modified property svn:ignore.
+
 2010-12-01  Steve Falkenburg  <sfalken@apple.com>
 
         Reviewed by Adam Roben.
-- 
cgit v1.1