summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorniklase <niklase@chromium.org>2014-09-24 09:28:33 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-24 16:29:04 +0000
commit5d589bd8b75e5a0b719c8df810604d6b8afd1931 (patch)
tree0a46ebd3032420a15a3d57fb60caa68225e39f0e
parent55c7faab2f0ce87d91d4cb995a41bb260210e773 (diff)
downloadchromium_src-5d589bd8b75e5a0b719c8df810604d6b8afd1931.zip
chromium_src-5d589bd8b75e5a0b719c8df810604d6b8afd1931.tar.gz
chromium_src-5d589bd8b75e5a0b719c8df810604d6b8afd1931.tar.bz2
Roll WebRTC and libJingle to r7287
TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/603453003 Cr-Commit-Position: refs/heads/master@{#296435}
-rw-r--r--DEPS4
-rw-r--r--third_party/libjingle/README.chromium2
2 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 1674b29..05d0d1e 100644
--- a/DEPS
+++ b/DEPS
@@ -214,7 +214,7 @@ deps = {
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'efa2e5d00c218551242fa50931cd81332359a509',
'src/third_party/libjingle/source/talk':
- Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'b25f2cd3bd9b8444d2a1d48ca26e2721b42c78e1',
+ Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '47740f2c26aea1b3b7830abdcba063a12a61d009',
'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/usrsctplib.git' + '@' + '8975bd5397c2ec97f50e0b87b544054e0536bfe1',
@@ -241,7 +241,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' + '@' + '70861e04b3580c1350c5479c9ee26469f38ff782',
+ Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '291035ed1d8ec308ffbc81e9cd119e2f53f92f86',
'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 c112004..e1a71dc 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: 7234
+Revision: 7287
License: BSD
License File: source/talk/COPYING
Security Critical: yes