diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:11:33 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:11:33 +0000 |
| commit | 248c31d0f7b9dc92cee27f1c6224244bfcbc38c1 (patch) | |
| tree | bd9408999b0f0dab3dff6f3450b43fc2ed012742 /remoting/jingle_glue | |
| parent | b50828184503840d93876db2de2e171cd9ae2608 (diff) | |
| download | chromium_src-248c31d0f7b9dc92cee27f1c6224244bfcbc38c1.zip chromium_src-248c31d0f7b9dc92cee27f1c6224244bfcbc38c1.tar.gz chromium_src-248c31d0f7b9dc92cee27f1c6224244bfcbc38c1.tar.bz2 | |
Roll libjingle to r124. Removed overrides for the ws2 fixes.
Roll webrtc to 1888.
BUG=115702,117252
TEST=apprtc.appspot.com on windows and linux
Review URL: https://chromiumcodereview.appspot.com/9600066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/xmpp_socket_adapter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/jingle_glue/xmpp_socket_adapter.cc b/remoting/jingle_glue/xmpp_socket_adapter.cc index e819736..611d70f 100644 --- a/remoting/jingle_glue/xmpp_socket_adapter.cc +++ b/remoting/jingle_glue/xmpp_socket_adapter.cc @@ -9,8 +9,8 @@ #include "base/logging.h" #include "remoting/jingle_glue/ssl_adapter.h" -#include "third_party/libjingle/overrides/talk/base/byteorder.h" #include "third_party/libjingle/overrides/talk/base/thread.h" +#include "third_party/libjingle/source/talk/base/byteorder.h" #include "third_party/libjingle/source/talk/base/common.h" #include "third_party/libjingle/source/talk/base/firewallsocketserver.h" #include "third_party/libjingle/source/talk/base/socketadapters.h" |