diff options
author | pbos <pbos@chromium.org> | 2016-03-22 05:44:40 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 12:46:38 +0000 |
commit | 72002e9efab473330a5359a1aeb8c6b96f5e6010 (patch) | |
tree | 7054f570b4a60ae733d3be540e7a71e3715549a3 /DEPS | |
parent | 787cdbf613ebb99b5614a9a5a2fb896dbeb355a1 (diff) | |
download | chromium_src-72002e9efab473330a5359a1aeb8c6b96f5e6010.zip chromium_src-72002e9efab473330a5359a1aeb8c6b96f5e6010.tar.gz chromium_src-72002e9efab473330a5359a1aeb8c6b96f5e6010.tar.bz2 |
Roll WebRTC 12073:12086, Libjingle 12065:12079
WebRTC 12073:12086
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/43d34df..a14fffd
Libjingle 12065:12079
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/b55d904..e353d8a
R=tommi@chromium.org
BUG=595274
Review URL: https://codereview.chromium.org/1821993002
Cr-Commit-Position: refs/heads/master@{#382559}
Diffstat (limited to 'DEPS')
-rw-r--r-- | DEPS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -188,7 +188,7 @@ deps = { Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'beef68513861e11156899b1f763097c31808c418', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'b55d904a18bca29ce00a7a1b4d9a2b20f09e26ba', # commit position 12065 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'e353d8aae242eef80ced0024fc923484efadb40e', # commit position 12079 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + 'c60ec8b35c3fe6027d7a3faae89d1c8d7dd3ce98', @@ -212,7 +212,7 @@ deps = { Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', 'src/third_party/webrtc': - Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '43d34df0c91c8a246ba35a9c9c3e5c91e9f681bf', # commit position 12073 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'a14fffdd52563b2d0152a3e96452ba382da6dc37', # commit position 12086 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), |