Bertrand Songis 582b14e919 Merge remote-tracking branch 'origin/next' into ...

bsongis/Issue554_trims_relative_default

Conflicts:
	companion/src/eeprominterface.h
	companion/src/firmwares/er9x/er9xinterface.cpp
	companion/src/firmwares/ersky9x/ersky9xinterface.cpp

2014-01-31 22:15:23 +01:00

..

src

Merge remote-tracking branch 'origin/next' into

2014-01-31 22:15:23 +01:00

util

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

releasenotes-9x.txt

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

releasenotes-taranis.txt

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00