diff options
| author | Ben Murdoch <benm@google.com> | 2013-08-07 11:04:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-08-07 11:04:47 +0100 |
| commit | 3240926e260ce088908e02ac07a6cf7b0c0cbf44 (patch) | |
| tree | 5ff5fa16b2fb9278c6d731b3d19123731f3f8626 /DEPS | |
| parent | 3b21a50ee4fe6f71bb117cbee9998a4f465eea9d (diff) | |
| download | chromium_org-3240926e260ce088908e02ac07a6cf7b0c0cbf44.tar.gz | |
Merge from Chromium at DEPS revision r216133
This commit was generated by merge_to_master.py.
Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -8,11 +8,11 @@ vars = { "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code", "webkit_trunk": "http://src.chromium.org/blink/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "155530", + "webkit_revision": "155634", "chromium_git": "https://chromium.googlesource.com", "chromiumos_git": "https://chromium.googlesource.com/chromiumos", "swig_revision": "69281", - "nacl_revision": "11912", + "nacl_revision": "11930", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. "nacl_tools_revision": "11437", # native_client/DEPS: tools_rev @@ -28,15 +28,15 @@ vars = { "ffmpeg_hash": "894e6f715645528e815aee2dad45b59704238dcd", "sfntly_revision": "134", - "skia_revision": "10524", + "skia_revision": "10553", # 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": "16053", + "v8_revision": "16065", # 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": "4462", + "webrtc_revision": "4490", "jsoncpp_revision": "248", "nss_revision": "209026", # Three lines of non-changing comments so that @@ -176,7 +176,7 @@ deps = { "src/third_party/usrsctp/usrsctplib": (Var("googlecode_url") % "sctp-refimpl") + - "/trunk/KERN/usrsctp/usrsctplib@8463", + "/trunk/KERN/usrsctp/usrsctplib@8554", "src/third_party/libsrtp": "/trunk/deps/third_party/libsrtp@214783", |