Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings

Browse Source

Conflicts:
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxeeprom.cpp
	radio/src/opentx.cpp
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt

...

This commit is contained in:

Andre Bernet

2014-02-10 14:47:32 +01:00

parent b39dd034c6 ac57faa85e

commit 2a83cffc53

238 changed files with 18614 additions and 8730 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

radio/src/gui/menu_model.cpp

+436 -374

File diff suppressed because it is too large Load Diff