Merge branch 'next' of https://github.com/opentx/opentx into bsongis/Issue524_SPORT_GPS
Conflicts: radio/src/translations.h
This commit is contained in:
@@ -449,6 +449,7 @@ const pm_char STR_SD_SECTORS[] PROGMEM = TR_SD_SECTORS;
|
||||
const pm_char STR_SD_SIZE[] PROGMEM = TR_SD_SIZE;
|
||||
const pm_char STR_TYPE[] PROGMEM = TR_TYPE;
|
||||
const pm_char STR_GLOBAL_VARS[] PROGMEM = TR_GLOBAL_VARS;
|
||||
const pm_char STR_GLOBAL_V[] PROGMEM = TR_GLOBAL_V;
|
||||
const pm_char STR_GLOBAL_VAR[] PROGMEM = TR_GLOBAL_VAR;
|
||||
const pm_char STR_OWN[] PROGMEM = TR_OWN;
|
||||
const pm_char STR_ROTARY_ENCODER[] PROGMEM = TR_ROTARY_ENCODER;
|
||||
|
||||
Reference in New Issue
Block a user