piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'origin/next'

Browse Source 
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:
Kjell Kernen
2014-02-20 21:37:51 +01:00
parent 681a4f436c de3e0e802f
commit 58d8a99511
81 changed files with 4326 additions and 9704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/splashlibrary.cpp
+2
View File
@@ -5,10 +5,12 @@
#include "helpers.h"
//#include "splashlabel.h"
#include "flashinterface.h"
#include "helpers.h"
splashLibrary::splashLibrary(QWidget *parent, QString * fileName) : QDialog(parent), ui(new Ui::splashLibrary) {
splashFileName = fileName;
ui->setupUi(this);
this->setWindowIcon(CompanionIcon("library.png"));
ui->nextPage->setIcon(CompanionIcon("arrow-right.png"));
ui->prevPage->setIcon(CompanionIcon("arrow-left.png"));
page = 0;