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

Merge branch 'master' into jsonapi

Browse source
This commit is contained in:
G10h4ck 2018-10-10 22:23:28 +02:00 • committed by GitHub
commit 047ae7f723
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
260 changed files with 1737 additions and 1178 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libretroshare/src/retroshare/rspeers.h
View file

@ -30,6 +30,7 @@
#include "retroshare/rsids.h"
#include "util/rsurl.h"
#include "util/rsdeprecate.h"
#include "util/rstime.h"
class RsPeers;
@ -272,7 +273,7 @@ struct RsPeerDetails : RsSerializable
/* have we been denied */
bool wasDeniedConnection;
time_t deniedTS;
rstime_t deniedTS;
/* linkType */
uint32_t linkType;