Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 13:49:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged with latest master before creating PR

Browse source
This commit is contained in:
csoler 2015-12-04 21:24:51 -05:00
commit 9193d3579b
294 changed files with 13080 additions and 8470 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/chat/PopupDistantChatDialog.h
View file

@ -50,7 +50,7 @@ class PopupDistantChatDialog: public PopupChatDialog
private:
QTimer *_update_timer ;
DistantChatPeerId _tunnel_id ;
QLabel *_status_label ;
QToolButton *_status_label ;
friend class ChatDialog;
};