From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 21 May 2010 16:53:46 +0100
Subject: Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
---
 WebKit/chromium/gyp_webkit | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'WebKit/chromium/gyp_webkit')

diff --git a/WebKit/chromium/gyp_webkit b/WebKit/chromium/gyp_webkit
index 812ed27..1ca6133 100755
--- a/WebKit/chromium/gyp_webkit
+++ b/WebKit/chromium/gyp_webkit
@@ -91,8 +91,7 @@ if __name__ == '__main__':
                '--depth=./',
 
                # gyp files to execute.
-               'WebKit.gyp',
-               '../../WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp'])
+               'WebKit.gyp'])
 
   print 'Updating webkit projects from gyp files...'
   sys.stdout.flush()
-- 
cgit v1.1