merging gxs_phase2 branch

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2013-06-04 21:00:43 +00:00
parent 1150366913
commit 325fa4f222
116 changed files with 6050 additions and 3596 deletions

View file

@ -10,6 +10,9 @@
#include <map>
#include <vector>
#include <string>
#include <inttypes.h>
typedef std::string RsGxsGroupId;
typedef std::string RsGxsMessageId;
@ -60,6 +63,7 @@ public:
// for circles
std::string mCircleId;
uint32_t mCircleType;
uint32_t mAuthenFlags;
// BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG.