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

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/serialiser/rshistoryitems.h
View file

@ -28,6 +28,7 @@
#include "serialiser/rsserviceids.h"
#include "serialiser/rsserial.h"
#include "retroshare/rstypes.h"
/**************************************************************************/
@ -40,9 +41,9 @@ public:
virtual void clear();
std::ostream& print(std::ostream &out, uint16_t indent = 0);
std::string chatPeerId; // empty for global chat
RsPeerId chatPeerId; // empty for global chat
bool incoming;
std::string peerId;
RsPeerId peerId;
std::string peerName;
uint32_t sendTime;
uint32_t recvTime;