mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-29 00:27:27 -04:00
Merge branch 'master' into thewire_fix_message_display
This commit is contained in:
commit
3402aa861f
119 changed files with 1809 additions and 1100 deletions
|
@ -89,7 +89,7 @@ void WireGroupDialog::initUi()
|
|||
|
||||
QPixmap WireGroupDialog::serviceImage()
|
||||
{
|
||||
return QPixmap(":/images/wire_create_64.png");
|
||||
return QPixmap(":/icons/wire-circle.png");
|
||||
}
|
||||
|
||||
void WireGroupDialog::prepareWireGroup(RsWireGroup &group, const RsGroupMetaData &meta)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue