Commit 465a3e22 authored by Henrik Grunell's avatar Henrik Grunell

Roll WebRTC 6937048:61576f5 and libjingle 13b2d03:965dd26

This is to revision 7151.

TBR=hellner@chromium.org, sergeyu@chromium.org

Review URL: https://codereview.chromium.org/557223004

Cr-Commit-Position: refs/heads/master@{#294383}
parent f3198fb3
...@@ -212,7 +212,7 @@ deps = { ...@@ -212,7 +212,7 @@ deps = {
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '98ca32e50f6e38447bc81705d0689ebceb6ac649', Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '98ca32e50f6e38447bc81705d0689ebceb6ac649',
'src/third_party/libjingle/source/talk': 'src/third_party/libjingle/source/talk':
Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '13b2d035e2e7f2f18e3a4d3377bc1a09f43a4ff9', Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '965dd26ef1dfb1c2d5f3da91fad1c73bb73bc5fa',
'src/third_party/usrsctp/usrsctplib': 'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/usrsctplib.git' + '@' + '8975bd5397c2ec97f50e0b87b544054e0536bfe1', Var('chromium_git') + '/external/usrsctplib.git' + '@' + '8975bd5397c2ec97f50e0b87b544054e0536bfe1',
...@@ -239,7 +239,7 @@ deps = { ...@@ -239,7 +239,7 @@ deps = {
Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
'src/third_party/webrtc': 'src/third_party/webrtc':
Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '69370488385c14d73e6ae8a3d5001c42884f9275', Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '61576f53599cf7840d3c4ebab82802b90031adcd',
'src/third_party/openmax_dl': 'src/third_party/openmax_dl':
Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),
......
Name: libjingle Name: libjingle
URL: http://code.google.com/p/webrtc/ URL: http://code.google.com/p/webrtc/
Version: unknown Version: unknown
Revision: 7045 Revision: 7151
License: BSD License: BSD
License File: source/talk/COPYING License File: source/talk/COPYING
Security Critical: yes Security Critical: yes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment