diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-25 10:06:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-25 10:06:34 +0100 |
| commit | bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 (patch) | |
| tree | 51387d1614b16fcf107004649d44707d271da339 /DEPS | |
| parent | 8a142c18176c4e279012cb218f060cfc3df087c5 (diff) | |
| download | chromium_org-bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3.tar.gz | |
Merge from Chromium at DEPS revision r213605
This commit was generated by merge_to_master.py.
Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -8,7 +8,7 @@ vars = { "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", "webkit_trunk": "http://src.chromium.org/blink/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "154818", + "webkit_revision": "154842", "chromium_git": "https://chromium.googlesource.com", "chromiumos_git": "https://chromium.googlesource.com/chromiumos", "swig_revision": "69281", @@ -29,7 +29,7 @@ vars = { "ffmpeg_hash": "245a8c0cdfdd5ab3da9045089661017e9ddd8d0e", "sfntly_revision": "134", - "skia_revision": "10239", + "skia_revision": "10309", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. @@ -445,7 +445,7 @@ deps_os = { # Build tools for targeting ChromeOS. "src/third_party/chromite": Var("chromiumos_git") + "/chromite.git" + - "@785fedc51fc430445d8f397440012ea3b489bac9", + "@93281fa6a9fa1af48aae02d0a9c142a4450af51e", # Dependency of chromite.git. "src/third_party/pyelftools": |