diff options
| author | guidou <guidou@chromium.org> | 2016-03-24 11:14:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 18:15:08 +0000 |
| commit | dc53f6c958b325971ae43cf199924c6a54adaa0a (patch) | |
| tree | fe3b42fe972e3da3185fcc8913b3ff1486c278ff /DEPS | |
| parent | 6446c0e591ed89ee959511dd4f1c9cb5c4290609 (diff) | |
| download | chromium_src-dc53f6c958b325971ae43cf199924c6a54adaa0a.zip chromium_src-dc53f6c958b325971ae43cf199924c6a54adaa0a.tar.gz chromium_src-dc53f6c958b325971ae43cf199924c6a54adaa0a.tar.bz2 | |
Roll WebRTC 12101:12119, Libjingle 12099:12115
WebRTC 12101:12119
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/dc4cf77..df760cd
Libjingle 12099:12115
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/ee09fe5..2688852
TBR=
BUG=
Review URL: https://codereview.chromium.org/1830203002
Cr-Commit-Position: refs/heads/master@{#383098}
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' + '@' + 'ee09fe5c62cf92dd93a2bb5b28eb4abc86f261fa', # commit position 12099 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '2688852545209f68491336f0e5fe3ba674b6ca6c', # commit position 12115 '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' + '@' + 'dc4cf7723f0a4687abb26af06203ede08578e684', # commit position 12101 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'df760cd28a1a2a3f628c67dd85d51d52f1ea5d99', # commit position 12119 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), |