Merge branch 'next' of https://github.com/opentx/opentx into mhotar/layout_alignments_Issue#584

2014-01-26 21:18:45 +01:00
parent 7c1ff4949e 0c015f321a
commit 220ddb8bcf
532 changed files with 732 additions and 661 deletions
@@ -460,6 +460,7 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text";
  const pm_char STR_MODELNAME[] PROGMEM = TR_MODELNAME;
  const pm_char STR_PHASENAME[] PROGMEM = TR_PHASENAME;
  const pm_char STR_MIXNAME[] PROGMEM = TR_MIXNAME;
+  const pm_char STR_INPUTNAME[] PROGMEM = TR_INPUTNAME;
  const pm_char STR_EXPONAME[] PROGMEM = TR_EXPONAME;
 #endif