ported branch v0.5.0 commits 2529 and 2544 to trunk

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-15 12:57:08 +00:00
parent a4d1e61aa2
commit cc17744ee3
13 changed files with 123 additions and 105 deletions

View file

@ -70,7 +70,7 @@ private slots:
void sendHtmlLinkTo();
void sendLinkToCloud();
void addLinkToCloud();
void sendLinktoChat();
// void sendLinktoChat();
void showFrame(bool show);
void showFrameRemote(bool show);