diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 20:04:11 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 20:04:11 +0000 |
| commit | 73ba2d3854de8691df351a03de34f2e5261038f4 (patch) | |
| tree | d97826d9e112d13a6c9142d85ea819eac18ebc08 /DEPS | |
| parent | 23e891ac1f17ddf3fa4221729b0ebf5fe548a48a (diff) | |
| download | chromium_src-73ba2d3854de8691df351a03de34f2e5261038f4.zip chromium_src-73ba2d3854de8691df351a03de34f2e5261038f4.tar.gz chromium_src-73ba2d3854de8691df351a03de34f2e5261038f4.tar.bz2 | |
Webkit merge from 44668 to 44682.
Fix a the compile by renaming JSONObject to InspectorJSONObject
(upstream r44682) and add a test expection for a new test. The
windows expectation is just a copy of the linux one, I need to
rebaseline it on windows.
Review URL: http://codereview.chromium.org/126148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "44668", + "webkit_revision": "44682", } |