move xmpp and p2p to webrtc
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:
@@ -25,12 +25,12 @@
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef TALK_P2P_BASE_STUNREQUEST_H_
|
||||
#define TALK_P2P_BASE_STUNREQUEST_H_
|
||||
#ifndef WEBRTC_P2P_BASE_STUNREQUEST_H_
|
||||
#define WEBRTC_P2P_BASE_STUNREQUEST_H_
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include "talk/p2p/base/stun.h"
|
||||
#include "webrtc/p2p/base/stun.h"
|
||||
#include "webrtc/base/sigslot.h"
|
||||
#include "webrtc/base/thread.h"
|
||||
|
||||
@@ -130,4 +130,4 @@ private:
|
||||
|
||||
} // namespace cricket
|
||||
|
||||
#endif // TALK_P2P_BASE_STUNREQUEST_H_
|
||||
#endif // WEBRTC_P2P_BASE_STUNREQUEST_H_
|
||||
|
||||
Reference in New Issue
Block a user