1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00

Merge remote-tracking branch 'origin/next' into

bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/gui/menu_model.cpp
This commit is contained in:
Bertrand Songis 2014-02-05 08:01:40 +01:00
commit 873d2c4377
54 changed files with 32441 additions and 30508 deletions

View file

@ -1196,10 +1196,7 @@ extern int8_t calcRESXto100(int16_t x);
#define TMR_VAROFS 5
extern const char stamp1[];
extern const char stamp2[];
extern const char stamp3[];
extern const char eeprom_stamp[];
extern const char vers_stamp[];
extern uint8_t g_vbat100mV;
#define g_blinkTmr10ms (*(uint8_t*)&g_tmr10ms)