Conflicts:
	companion/src/firmwares/opentx/opentxeeprom.cpp
	companion/src/modeledit/customfunctions.cpp
This commit is contained in:
bsongis
2014-11-19 21:19:20 +01:00
parent 47067b9169
commit a690352100
4 changed files with 22 additions and 3 deletions
+2
View File
@@ -854,6 +854,8 @@ QString CustomFunctionData::funcToString()
return QObject::tr("Play Both");
else if (func == FuncPlayValue)
return QObject::tr("Play Value");
else if (func == FuncPlayScript)
return QObject::tr("Play Script");
else if (func == FuncLogs)
return QObject::tr("Start Logs");
else if (func == FuncVolume)