summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorhclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-02 03:20:47 +0000
committerhclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-02 03:20:47 +0000
commit954190d6276dcfcb315c2f4c0342a2d17d2a5258 (patch)
treebb72efec204e419687916d30c36d5d78ff40c1ca /third_party
parent9a494877fcbc832b0c1bce73db3665e64e37f085 (diff)
downloadchromium_src-954190d6276dcfcb315c2f4c0342a2d17d2a5258.zip
chromium_src-954190d6276dcfcb315c2f4c0342a2d17d2a5258.tar.gz
chromium_src-954190d6276dcfcb315c2f4c0342a2d17d2a5258.tar.bz2
Roll libjingle 287:288
BUG=177139 Review URL: https://codereview.chromium.org/12377062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libjingle/README.chromium2
-rw-r--r--third_party/libjingle/libjingle.gyp1
2 files changed, 1 insertions, 2 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 4c315c8..48fa0a0 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/libjingle/
Version: unknown
-Revision: 287
+Revision: 288
License: BSD
License File: source/COPYING
Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index a6e52fc..9d707e0 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -633,7 +633,6 @@
'<(libjingle_source)/talk/app/webrtc/mediastreamhandler.h',
'<(libjingle_source)/talk/app/webrtc/mediastreaminterface.h',
'<(libjingle_source)/talk/app/webrtc/mediastreamprovider.h',
- '<(libjingle_source)/talk/app/webrtc/mediastreamproxy.cc',
'<(libjingle_source)/talk/app/webrtc/mediastreamproxy.h',
'<(libjingle_source)/talk/app/webrtc/mediastreamsignaling.cc',
'<(libjingle_source)/talk/app/webrtc/mediastreamsignaling.h',