From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Fri, 21 May 2010 16:53:46 +0100 Subject: Merge WebKit at r59636: Initial merge by git Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91 --- WebKit/chromium/DEPS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'WebKit/chromium/DEPS') diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS index 07401d7..9e34fe4 100644 --- a/WebKit/chromium/DEPS +++ b/WebKit/chromium/DEPS @@ -32,7 +32,7 @@ vars = { 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', - 'chromium_rev': '45932', + 'chromium_rev': '46899', 'pthreads-win32_rev': '26716', } @@ -132,6 +132,9 @@ deps = { 'third_party/npapi': Var('chromium_svn')+'/third_party/npapi@'+Var('chromium_rev'), + 'third_party/ppapi': + From('chromium_deps', 'src/third_party/ppapi'), + 'third_party/ots': From('chromium_deps', 'src/third_party/ots'), -- cgit v1.1