diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 23:28:20 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 23:28:20 +0000 |
commit | 891c71789b6f3382a5edec024c8a478df523d7fd (patch) | |
tree | a98920e94a0fc32e74e703810eec562e9179a5a5 /DEPS | |
parent | 5a7362fefe60518a51593ddbf4649bc48493d459 (diff) | |
download | chromium_src-891c71789b6f3382a5edec024c8a478df523d7fd.zip chromium_src-891c71789b6f3382a5edec024c8a478df523d7fd.tar.gz chromium_src-891c71789b6f3382a5edec024c8a478df523d7fd.tar.bz2 |
Chrome side of webkit merge to 40124.
Not much here other than CanvasPixelArray being re-added
in webkit@r40089.
Changes:
http://trac.webkit.org/changeset?new=40124@trunk&old=40086@trunk
Review URL: http://codereview.chromium.org/16617
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r-- | DEPS | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@8457", + "/trunk/deps/third_party/WebKit@8513", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7525", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@1103", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40086", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40124", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@40086", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@40124", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40086", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40124", } |