merged upstream/master

This commit is contained in:
csoler 2017-05-21 13:49:41 +02:00
commit b341fea170
46 changed files with 1399 additions and 560 deletions

View file

@ -60,6 +60,8 @@ public:
public:
RsMsgMetaData mMeta;
std::set<RsGxsMessageId> mOlderVersions ;
std::string mMsg; // UTF8 encoded.
std::list<RsGxsFile> mFiles;