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

Browse Source

Conflicts:
	companion/src/avroutputdialog.cpp
	companion/src/burnconfigdialog.cpp
	companion/src/eeprominterface.cpp
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/helpers.cpp
	radio/src/gui/menu_general.cpp
	radio/src/opentx.cpp

...

This commit is contained in:

bsongis

2014-03-03 16:41:41 +01:00

parent b94da82e17 145c741307

commit a18953f6a2

1753 changed files with 183140 additions and 111274 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

companion/src/eeprominterface.cpp

+799 -364

File diff suppressed because it is too large Load Diff