summaryrefslogtreecommitdiff
path: root/DEPS
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-06-11 16:24:11 +0100
committerTorne (Richard Coles) <torne@google.com>2013-06-11 16:24:11 +0100
commit5e3f23d412006dc4db4e659864679f29341e113f (patch)
treefb52e3eb179269ea21e0b510509ecf9e8d7b3111 /DEPS
parenta486f6ca78e90d14f48125ef943e045218aac565 (diff)
downloadchromium_org-5e3f23d412006dc4db4e659864679f29341e113f.tar.gz
Merge from Chromium at DEPS revision r205548
This commit was generated by merge_to_master.py. Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 789fd31cbd..f7ced452cc 100644
--- a/DEPS
+++ b/DEPS
@@ -29,11 +29,11 @@ vars = {
"ffmpeg_hash": "245a8c0cdfdd5ab3da9045089661017e9ddd8d0e",
"sfntly_revision": "134",
- "skia_revision": "9484",
+ "skia_revision": "9499",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
- "v8_revision": "15040",
+ "v8_revision": "15051",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling WebRTC
# and V8 without interference from each other.