summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordeadbeef <deadbeef@chromium.org>2015-09-23 11:26:25 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-23 18:27:01 +0000
commitc912315bd1a2e2def25caf9366ecf2f2df284c93 (patch)
tree5ffaba8c10c070fcb6af21695301141f52c11cba /DEPS
parentfa2e4f2d931e0290ecab3df2e87b161795dfc7ac (diff)
downloadchromium_src-c912315bd1a2e2def25caf9366ecf2f2df284c93.zip
chromium_src-c912315bd1a2e2def25caf9366ecf2f2df284c93.tar.gz
chromium_src-c912315bd1a2e2def25caf9366ecf2f2df284c93.tar.bz2
Roll WebRTC 10010:10022, Libjingle 10011:10022
WebRTC 10010:10022 Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/ea85c10..a6e4fcd Libjingle 10011:10022 Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/300c749..228d997 Review URL: https://codereview.chromium.org/1323243006 Cr-Commit-Position: refs/heads/master@{#350347}
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index f1d1741..85a11cb 100644
--- a/DEPS
+++ b/DEPS
@@ -191,7 +191,7 @@ deps = {
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '382b031ebab06b25df0708dd44aafad235657d2c',
'src/third_party/libjingle/source/talk':
- Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '300c7492bf1d44614047e24a453a1f13a9c9719d', # commit position 10011
+ Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '228d997b9a60b755dbc985b78b3053dc461b4be7', # commit position 10022
'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215
@@ -215,7 +215,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' + '@' + 'ea85c10a428fd5f038e969e00833dd4b1a96e1f7', # commit position 10010
+ Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'a6e4fcd3f63f91d0f15cebb1e391c9d83d42d4d6', # commit position 10022
'src/third_party/openmax_dl':
Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),