diff options
| author | perkj <perkj@chromium.org> | 2014-09-19 01:41:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-19 08:42:09 +0000 |
| commit | 4a201500096268fa4ec2d26abfbfa8f7c7cc348e (patch) | |
| tree | ab44e4054014ef34ce5938f119aa20406832a033 | |
| parent | 8afbc8c653a3feae3831cd562d0abf9fed3a7964 (diff) | |
| download | chromium_src-4a201500096268fa4ec2d26abfbfa8f7c7cc348e.zip chromium_src-4a201500096268fa4ec2d26abfbfa8f7c7cc348e.tar.gz chromium_src-4a201500096268fa4ec2d26abfbfa8f7c7cc348e.tar.bz2 | |
Roll WebRtc/Libjingle to r7234.
TBR=kjellander@chromium.org
Review URL: https://codereview.chromium.org/578383005
Cr-Commit-Position: refs/heads/master@{#295682}
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -206,7 +206,7 @@ deps = { Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '62512b980ce409fda75037e893a0fe0f5be30326', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '1f59bcb2ae6b867fb2f52ff4654b137f98b30536', + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'b25f2cd3bd9b8444d2a1d48ca26e2721b42c78e1', 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/usrsctplib.git' + '@' + '8975bd5397c2ec97f50e0b87b544054e0536bfe1', @@ -233,7 +233,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' + '@' + '34374d1ea3f56216836788b7378c69a540fe9197', + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '70861e04b3580c1350c5479c9ee26469f38ff782', '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 4ca5999..c112004 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: 7190 +Revision: 7234 License: BSD License File: source/talk/COPYING Security Critical: yes |