Merge remote-tracking branch 'origin/next' into mhotar/layout_alignments_Issue #584

Conflicts: radio/src/translations/es.h.txt radio/src/translations/fr.h.txt radio/src/translations/pl.h.txt Manually resolved.
2014-02-04 13:41:39 +01:00
parent 49bcb3b0fc 08cc65b517
commit 40edf9f88a
242 changed files with 41099 additions and 31496 deletions
@@ -1152,7 +1152,7 @@ void putsTmrMode(xcoord_t x, uint8_t y, int8_t mode, LcdFlags att)
    return;
  }

-  if (mode >= TMR_VAROFS+MAX_PSWITCH+NUM_CSW) {
+  if (mode >= TMR_VAROFS+NUM_PSWITCH+NUM_CSW) {
    mode++;
  }