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
+1
View File
@@ -629,6 +629,7 @@ enum AssignFunc {
FuncPlayPrompt,
FuncPlayBoth,
FuncPlayValue,
FuncPlayScript,
FuncLogs,
FuncVolume,
FuncBacklight,