Andre Bernet 0ffd0c8e0b Merge branch 'next' of https://github.com/opentx/opentx into TaranisPlus ...

Conflicts:
	companion/src/firmwares/opentx/opentxinterface.cpp
	radio/src/haptic.cpp
	radio/src/targets/gruvin9x/board_gruvin9x.h
	radio/src/targets/mega2560/board_mega2560.h
	radio/src/targets/sky9x/board_sky9x.h
	radio/src/targets/stock/board_stock.h
	radio/src/targets/taranis/board_taranis.h
	radio/src/targets/taranis/haptic_driver.cpp

2014-04-29 15:13:05 +02:00

..

src

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

2014-04-29 15:13:05 +02:00

targets

Fixes #974

2014-04-14 19:04:32 +02:00

releasenotes.txt

Release notes synced with SVN

2014-03-20 22:10:53 +01:00