diff options
| author | tommi <tommi@chromium.org> | 2016-01-12 04:50:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-12 12:51:23 +0000 |
| commit | 78b8cf63edb5a9a693d6a0a0208047acba549621 (patch) | |
| tree | ef31d7aa266a988779f9259edaabff7f44b72f2f | |
| parent | 86b92e11f0ff7483f03f9064b07bf220d7d42b68 (diff) | |
| download | chromium_src-78b8cf63edb5a9a693d6a0a0208047acba549621.zip chromium_src-78b8cf63edb5a9a693d6a0a0208047acba549621.tar.gz chromium_src-78b8cf63edb5a9a693d6a0a0208047acba549621.tar.bz2 | |
Roll WebRTC 11201:11216, Libjingle 11192:11215
WebRTC 11201:11216
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/27e892c..32cf6e2
Libjingle 11192:11215
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/cc9b470..105c113
TBR=
BUG=
Review URL: https://codereview.chromium.org/1572913005
Cr-Commit-Position: refs/heads/master@{#368858}
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -187,7 +187,7 @@ deps = { Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'a41fa511bc02a9b133b6c966cd950dbdf0dbbe56', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'cc9b470801cd7ca7f292ceebdf8094c67a599712', # commit position 11192 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '105c113117d05ea4323b63c958ac0f958804c0ad', # commit position 11215 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + 'c60ec8b35c3fe6027d7a3faae89d1c8d7dd3ce98', @@ -211,7 +211,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' + '@' + '27e892cf8676cebcade0e96cad26870600c08d0f', # commit position 11201 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '32cf6e25dfdf3408ce32305e42978f968e20e092', # commit position 11216 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 4980ff7..1628ebd 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://www.webrtc.org Version: unknown -Revision: 11192 +Revision: 11215 License: BSD License File: source/talk/COPYING Security Critical: yes |