diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-26 10:20:38 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-26 10:20:38 +0100 |
| commit | 58e6fbe4ee35d65e14b626c557d37565bf8ad179 (patch) | |
| tree | 8cf095f4f552a47efa4566d1983574e75bc85595 /DEPS | |
| parent | 0e2fcb857cf4c6230fc3aa213f6a0b0b4f644fd0 (diff) | |
| download | chromium_org-58e6fbe4ee35d65e14b626c557d37565bf8ad179.tar.gz | |
Merge from Chromium at DEPS revision r213780
This commit was generated by merge_to_master.py.
Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 10 |
1 files changed, 5 insertions, 5 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": "154842", + "webkit_revision": "154965", "chromium_git": "https://chromium.googlesource.com", "chromiumos_git": "https://chromium.googlesource.com/chromiumos", "swig_revision": "69281", @@ -29,21 +29,21 @@ vars = { "ffmpeg_hash": "245a8c0cdfdd5ab3da9045089661017e9ddd8d0e", "sfntly_revision": "134", - "skia_revision": "10309", + "skia_revision": "10338", # 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": "15825", + "v8_revision": "15886", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling WebRTC # and V8 without interference from each other. - "webrtc_revision": "4297", + "webrtc_revision": "4409", "jsoncpp_revision": "248", "nss_revision": "209026", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarm_client # and whatever else without interference from each other. - "swarm_revision": "212588", + "swarm_revision": "213621", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling openssl # and whatever else without interference from each other. |