Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 09:15:38 +03:00
Code Issues Wiki Activity

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

Browse source 
Conflicts:
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
	radio/src/translations/pl.h.txt
Manually resolved.
This commit is contained in:
mhotar 2014-02-04 13:41:39 +01:00
commit 40edf9f88a
242 changed files with 41100 additions and 31497 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/lcd.cpp
View file

@ -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++;
}