Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port

Browse Source

Conflicts:
	companion/src/eeprominterface.cpp
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxeeprom.cpp
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/firmwares/opentx/opentxinterface.h
	companion/src/mdichild.cpp
	radio/src/Makefile

...

This commit is contained in:

bsongis

2014-05-11 22:48:48 +02:00

parent 8662a4ec68 a7d58e9a86

commit 61224e7207

477 changed files with 116230 additions and 71400 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/opentx.cpp

+424 -217

File diff suppressed because it is too large Load Diff