Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 06:06:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995)

Browse source 
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.

 * GXS Backend.
 * GXS Services:
	- Identities.
	- Circles
	- Photos
	- Wiki
	- GxsForums
	- Posted.
 * SSH no-gui server.

See branch commits for more info.

To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-12-16 19:17:11 +00:00
commit 069b72e0b2
549 changed files with 111171 additions and 25579 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/tcponudp/tou.h
View file

@ -40,10 +40,8 @@
#include <netinet/in.h>
#else
#include "util/rswin.h"
#include <stdint.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#include <stdio.h>
// #include <stdint.h>
typedef int socklen_t;

4
libretroshare/src/tcponudp/udpstunner.h
View file

@ -25,10 +25,6 @@
*
*/
#ifdef WINDOWS_SYS
#include "util/rswin.h"
#endif
#ifndef WINDOWS_SYS
#include <netinet/in.h>
#endif