merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-03-29 14:18:05 +00:00
parent 0e6302ac6a
commit 1042744685
53 changed files with 2387 additions and 1904 deletions

View file

@ -1312,7 +1312,7 @@ void FriendList::msgfriend()
std::string id = getRsId(peer);
MessageComposer::msgFriend(RsPeerId(id), (peer->type() == TYPE_GROUP));
MessageComposer::msgFriend(RsPeerId(id)) ;
}
void FriendList::recommendfriend()