updated v0.6-Circles with latest trunk

This commit is contained in:
csoler 2016-01-01 22:18:43 -05:00
commit 8ec0e10019
10 changed files with 142 additions and 77 deletions

View file

@ -1,4 +1,3 @@
/*
* libretroshare/src/gxs: rsgxnetservice.cc
*
@ -2751,6 +2750,8 @@ void RsGxsNetService::locked_stampPeerGroupUpdateTime(const RsPeerId& pid,const
{
pitem = new RsGxsMsgUpdateItem(mServType) ;
pitem->peerId = pid ;
mClientMsgUpdateMap[pid] = pitem ;
}
else
pitem = it->second ;
@ -4354,3 +4355,4 @@ void RsGxsNetService::handleRecvPublishKeys(RsNxsGroupPublishKeyItem *item)
}
}