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

Merge remote-tracking branch 'origin/next' into

Browse Source 
bsongis/refactoring_firmware_interface

Conflicts:
	companion/src/fwpreferencesdialog.cpp
	companion/src/fwpreferencesdialog.h
	companion/src/fwpreferencesdialog.ui
This commit is contained in:
bsongis
2014-04-19 08:21:58 +02:00
parent 9341aff386 72aff8c738
commit d7205c0601
6 changed files with 139 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/apppreferencesdialog.cpp
-2
View File
@@ -45,8 +45,6 @@ AppPreferencesDialog::~AppPreferencesDialog()
void AppPreferencesDialog::writeValues()
{
qDebug() << "writeValues";
g.autoCheckApp(ui->startupCheck_companion9x->isChecked());
g.autoCheckFw(ui->startupCheck_fw->isChecked());
g.showSplash(ui->showSplash->isChecked());