Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next

Conflicts:
	companion/src/CMakeLists.txt
	companion/src/main.cpp
	companion/src/modeledit.cpp
	companion/src/xsimulatordialog.cpp
This commit is contained in:
Bertrand Songis
2014-01-15 16:09:17 +01:00
76 changed files with 4784 additions and 4176 deletions
+1 -1
View File
@@ -196,7 +196,7 @@ void xsimulatorDialog::onTimerEvent()
static unsigned int lcd_counter = 0;
if (!simulator->timer10ms()) {
QMessageBox::critical(this, "companion9x", tr("Firmware %1 error: %2").arg(txInterface->getName()).arg(simulator->getError()));
QMessageBox::critical(this, "companion", tr("Firmware %1 error: %2").arg(txInterface->getName()).arg(simulator->getError()));
timer->stop();
return;
}