diff options
| author | pbos <pbos@chromium.org> | 2015-06-05 06:48:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 13:49:17 +0000 |
| commit | 14bd12d63019fbdd6f9d6c16b986a5f64a21264b (patch) | |
| tree | 4868127bc581ed9adf1969aeb2e574d026c947a8 /DEPS | |
| parent | a0add2c099683dcfc16d3b67c6c1c438c36c2ce7 (diff) | |
| download | chromium_src-14bd12d63019fbdd6f9d6c16b986a5f64a21264b.zip chromium_src-14bd12d63019fbdd6f9d6c16b986a5f64a21264b.tar.gz chromium_src-14bd12d63019fbdd6f9d6c16b986a5f64a21264b.tar.bz2 | |
Roll WebRTC 9381:9384, Libjingle 9381:9384
WebRTC 9381:9384
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/020eb8a..b125ba2
Libjingle 9381:9384
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/34e6126..78b410b
TBR=
BUG=
Review URL: https://codereview.chromium.org/1160203005
Cr-Commit-Position: refs/heads/master@{#333041}
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -201,7 +201,7 @@ deps = { Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'c0f05636c4472e5d3c0045ec34464aec46c5fb70', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '34e612676143b96ceaaa2fe867fb9b80556ae72f', # commit position 9381 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '78b410bcd08fe61fb91c4e1a307f5f0c7b5f8001', # commit position 9384 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 @@ -225,7 +225,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' + '@' + '020eb8ae242f0a35729dbb6520de5216e43d6906', # commit position 9381 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'b125ba2d56b2144d88bd692f1f2ca3f8ce116238', # commit position 9384 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), |