Merge branch 'origin/next'
Conflicts: companion/src/eeprominterface.cpp companion/src/firmwares/opentx/opentxinterface.cpp companion/src/mainwindow.cpp companion/src/simulatordialog.cpp companion/src/xsimulatordialog.cpp
This commit is contained in:
@@ -146,6 +146,7 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
|
||||
ui(new Ui::customizeSplashDialog)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
this->setWindowIcon(CompanionIcon("paint.png"));
|
||||
ui->leftLibraryButton->setIcon(CompanionIcon("library.png"));
|
||||
ui->rightLibraryButton->setIcon(CompanionIcon("library.png"));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user