diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
| commit | 4ad1aa43a48567659193a298fad74f55e00b3dd9 (patch) | |
| tree | b98c2a945dbec61aeb9edef5e371f905e7ab5b37 /DEPS | |
| parent | e92e8c41ae2718e381c0796a2c0b115a7d017a21 (diff) | |
| download | chromium_org-4ad1aa43a48567659193a298fad74f55e00b3dd9.tar.gz | |
Merge from Chromium at DEPS revision 260540
This commit was generated by merge_to_master.py.
Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -23,7 +23,7 @@ vars = { "libcxxabi_revision": "197063", "webkit_trunk": "http://src.chromium.org/blink/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "170423", + "webkit_revision": "170429", "chromium_git": "https://chromium.googlesource.com", "chromiumos_git": "https://chromium.googlesource.com/chromiumos", "skia_git": "https://skia.googlesource.com", @@ -45,8 +45,8 @@ vars = { "sfntly_revision": "228", "lighttpd_revision": "33737", - "skia_revision": "13966", - "skia_hash": "c94a028ff836f8f0af41ec33ceb1f4bc140841bf", + "skia_revision": "13989", + "skia_hash": "da0d978b1fa682f82d82f21924f2a786677fcdb5", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. |