generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move xmpp and p2p to webrtc

Browse Source 
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and
webrtc/p2p. Also makes libjingle use those version instead of the one in the talk folder.

BUG=3379

Review URL: https://webrtc-codereview.appspot.com/26999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7549 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-10-28 22:20:11 +00:00
parent 8b1b23f8f8
commit 269fb4bc90
465 changed files with 61160 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
talk/p2p/client/httpportallocator.h
View File

@@ -25,14 +25,14 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef TALK_P2P_CLIENT_HTTPPORTALLOCATOR_H_
#define TALK_P2P_CLIENT_HTTPPORTALLOCATOR_H_
#ifndef WEBRTC_P2P_CLIENT_HTTPPORTALLOCATOR_H_
#define WEBRTC_P2P_CLIENT_HTTPPORTALLOCATOR_H_
#include <list>
#include <string>
#include <vector>
#include "talk/p2p/client/basicportallocator.h"
#include "webrtc/p2p/client/basicportallocator.h"
class HttpPortAllocatorTest_TestSessionRequestUrl_Test;
@@ -187,4 +187,4 @@ class HttpPortAllocatorSession : public HttpPortAllocatorSessionBase {
} // namespace cricket
#endif // TALK_P2P_CLIENT_HTTPPORTALLOCATOR_H_
#endif // WEBRTC_P2P_CLIENT_HTTPPORTALLOCATOR_H_