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

Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p.

Browse Source 
BUG=3379
R=niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7459 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-10-15 17:30:28 +00:00
parent 3e2f8ff36c
commit d1ba6d9cbf
465 changed files with 61094 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
talk/p2p/base/sessiondescription.h
View File

@@ -25,13 +25,13 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef TALK_P2P_BASE_SESSIONDESCRIPTION_H_
#define TALK_P2P_BASE_SESSIONDESCRIPTION_H_
#ifndef WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_
#define WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_
#include <string>
#include <vector>
#include "talk/p2p/base/transportinfo.h"
#include "webrtc/p2p/base/transportinfo.h"
#include "webrtc/base/constructormagic.h"
namespace cricket {
@@ -199,4 +199,4 @@ enum ContentSource {
} // namespace cricket
#endif // TALK_P2P_BASE_SESSIONDESCRIPTION_H_
#endif // WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_