diff options
| author | tommi <tommi@chromium.org> | 2015-08-06 09:05:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-06 16:06:03 +0000 |
| commit | a1e307e62d831f0dd531c5a95384af54e17c1532 (patch) | |
| tree | 6d9567d2dd2a2a04a7a815427e507df251e98a33 | |
| parent | aae76bf8e36bdbc4a33f1d263dec6575c89e07f7 (diff) | |
| download | chromium_src-a1e307e62d831f0dd531c5a95384af54e17c1532.zip chromium_src-a1e307e62d831f0dd531c5a95384af54e17c1532.tar.gz chromium_src-a1e307e62d831f0dd531c5a95384af54e17c1532.tar.bz2 | |
Roll WebRTC 9677:9684, Libjingle 9679:9683
WebRTC 9677:9684
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/61ee070..4b50880
Libjingle 9679:9683
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/4a1fae7..942a295
TBR=
BUG=
Review URL: https://codereview.chromium.org/1273743003
Cr-Commit-Position: refs/heads/master@{#342120}
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -184,7 +184,7 @@ deps = { Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '833732528c1873f37b490b289eeaded2ae86349c', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '4a1fae7416f9c132d6719802d31f0baa5b36df1d', # commit position 9679 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '942a295c8100046dc3fa315bc2734a38e48eaec9', # commit position 9683 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 @@ -208,7 +208,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' + '@' + '61ee070b95b6708c9f72c7a1d75374731c8a2b49', # commit position 9677 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '4b50880e26ec952201e4d4643e60e5a7bc2d3534', # commit position 9684 '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 133c520..94dff6c 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://code.google.com/p/webrtc/ Version: unknown -Revision: 9679 +Revision: 9683 License: BSD License File: source/talk/COPYING Security Critical: yes |