Merge with 2.3

This commit is contained in:
Bertrand Songis
2019-08-29 11:06:31 +02:00
24 changed files with 89 additions and 57 deletions
+1 -1
View File
@@ -461,7 +461,7 @@ const char STR_CHANNELRANGE[] = TR_CHANNELRANGE;
const char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION;
const char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1;
const char STR_ANTENNACONFIRM2[] = TR_ANTENNACONFIRM2;
const char STR_R9M_PROTO_FLEX_WARN_LINE1[] = TR_R9M_PROTO_FLEX_WARN_LINE1;
const char STR_MODULE_PROTOCOL_FLEX_WARN_LINE1[] = TR_MODULE_PROTOCOL_FLEX_WARN_LINE1;
const char STR_R9M_PROTO_FCC_WARN_LINE1[] = TR_R9M_PROTO_FCC_WARN_LINE1;
const char STR_R9M_PROTO_EU_WARN_LINE1[] = TR_R9M_PROTO_EU_WARN_LINE1;
const char STR_R9M_PROTO_WARN_LINE2[] = TR_R9M_PROTO_WARN_LINE2;