summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-27 11:02:03 +0000
committergrunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-27 11:02:03 +0000
commit8de154062f77d8b149c949033c398337b64478f4 (patch)
tree590dbf20ec3cc8dfa5823c2e2eff8ff3c5d02642
parent7cb45cf4940e6352e11168971df2fcf4481dba62 (diff)
downloadchromium_src-8de154062f77d8b149c949033c398337b64478f4.zip
chromium_src-8de154062f77d8b149c949033c398337b64478f4.tar.gz
chromium_src-8de154062f77d8b149c949033c398337b64478f4.tar.bz2
Roll WebRTC 6189:6248.
TBR=ronghuawu@chromium.org Review URL: https://codereview.chromium.org/302583003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272937 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/libjingle/README.chromium2
2 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 34a66f4..3a847de 100644
--- a/DEPS
+++ b/DEPS
@@ -54,7 +54,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling WebRTC
# and V8 without interference from each other.
- "webrtc_revision": "6189",
+ "webrtc_revision": "6248",
"jsoncpp_revision": "248",
"nss_revision": "271760",
# Three lines of non-changing comments so that
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index e9465a7..ea5c85b 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: 6189
+Revision: 6248
License: BSD
License File: source/talk/COPYING
Security Critical: yes