diff options
author | guidou <guidou@chromium.org> | 2016-03-23 05:48:49 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-23 12:50:59 +0000 |
commit | c7c362af733ee1e3a601afa34d3dabfa4b930e97 (patch) | |
tree | 088914aa75fb4525fd4c8abf0de67a788f219796 /DEPS | |
parent | 502f38896d66b875a80ea32b747eeac0f5019d5e (diff) | |
download | chromium_src-c7c362af733ee1e3a601afa34d3dabfa4b930e97.zip chromium_src-c7c362af733ee1e3a601afa34d3dabfa4b930e97.tar.gz chromium_src-c7c362af733ee1e3a601afa34d3dabfa4b930e97.tar.bz2 |
Roll WebRTC 12086:12101, Libjingle 12079:12099
WebRTC 12086:12101
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/a14fffd..dc4cf77
Libjingle 12079:12099
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/e353d8a..ee09fe5
TBR=
BUG=
Review URL: https://codereview.chromium.org/1827753003
Cr-Commit-Position: refs/heads/master@{#382836}
Diffstat (limited to 'DEPS')
-rw-r--r-- | DEPS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -192,7 +192,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' + '@' + 'e353d8aae242eef80ced0024fc923484efadb40e', # commit position 12079 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'ee09fe5c62cf92dd93a2bb5b28eb4abc86f261fa', # commit position 12099 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + 'c60ec8b35c3fe6027d7a3faae89d1c8d7dd3ce98', @@ -216,7 +216,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' + '@' + 'a14fffdd52563b2d0152a3e96452ba382da6dc37', # commit position 12086 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'dc4cf7723f0a4687abb26af06203ede08578e684', # commit position 12101 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), |