Merge branch 'master' into thewire_fix_message_display

This commit is contained in:
drbob 2020-03-31 21:23:51 +11:00
commit 3402aa861f
119 changed files with 1809 additions and 1100 deletions

View file

@ -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)