diff options
| author | perkj <perkj@chromium.org> | 2016-03-17 05:29:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 12:30:54 +0000 |
| commit | d8c9adf60d0130f9e460f81181c56de5c51604fa (patch) | |
| tree | 376a3b785395e4cebc6b8e230731100fb0406c84 | |
| parent | 68efb4803bf77935194d31ca1d93e639282cd7b5 (diff) | |
| download | chromium_src-d8c9adf60d0130f9e460f81181c56de5c51604fa.zip chromium_src-d8c9adf60d0130f9e460f81181c56de5c51604fa.tar.gz chromium_src-d8c9adf60d0130f9e460f81181c56de5c51604fa.tar.bz2 | |
Roll WebRTC 12025:12032, Libjingle 12020:12032
WebRTC 12025:12032
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/4ac195e..4d7a738
Libjingle 12020:12032
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/75c1fc7..74207eb
TBR=
BUG=
Review URL: https://codereview.chromium.org/1813723003
Cr-Commit-Position: refs/heads/master@{#381694}
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
2 files changed, 3 insertions, 3 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' + '@' + '75c1fc7f8051f5e620db238861230b83813bcd95', # commit position 12020 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '74207eb9bd0531549670b56d662b1e02658bf529', # commit position 12032 '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' + '@' + '4ac195eb96d0c8f6446e9ab803ec8a471bdaa9e7', # commit position 12025 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '4d7a738c6fd0e64c228a20e10d26c8d3cce25936', # commit position 12032 '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 115f8d3..b78f784 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: 12020 +Revision: 12032 License: BSD License File: source/talk/COPYING Security Critical: yes |