diff options
| author | magjed <magjed@chromium.org> | 2015-06-02 09:05:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-02 16:05:55 +0000 |
| commit | 276cafeffa32ed8cb13fe752d5beb8f5cff77130 (patch) | |
| tree | 07f9d2a0fec110365bc41c06178d7ad31f01de35 /DEPS | |
| parent | 5c642131c3cdcbeed21bb9bf535f04e7947f959d (diff) | |
| download | chromium_src-276cafeffa32ed8cb13fe752d5beb8f5cff77130.zip chromium_src-276cafeffa32ed8cb13fe752d5beb8f5cff77130.tar.gz chromium_src-276cafeffa32ed8cb13fe752d5beb8f5cff77130.tar.bz2 | |
Roll WebRTC 9340:9354, Libjingle 9339:9354
WebRTC 9340:9354
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/7b929e8..13eda41
Libjingle 9339:9354
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/fe54215..9329d80
TBR=tommi@chromium.org
Review URL: https://codereview.chromium.org/1165783002
Cr-Commit-Position: refs/heads/master@{#332401}
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -204,7 +204,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' + '@' + 'fe54215b7c0a3d0d544857ea4c3e6785ed3eec8c', # commit position 9339 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '9329d80ec7306d3c2ee3bc3c17508956627ddeff', # commit position 9354 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 @@ -228,7 +228,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' + '@' + '7b929e8d526f741f5001f9c79eea0db02c88a188', # commit position 9340 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '13eda41c8f674fa500743161c0a17581dd58e41c', # commit position 9354 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), |