Bertrand Songis 9ade773618 Merge remote-tracking branch 'origin/next' into ...

bsongis/Issue713_more_custom_functions

Conflicts:
	radio/src/.gitignore
	radio/src/opentx.cpp

2014-02-21 14:26:11 +01:00

..

src

Merge remote-tracking branch 'origin/next' into

2014-02-21 14:26:11 +01:00

util

Revert "Revert "Merge branch 'next'""

2014-02-17 21:06:46 +01:00

.gitignore

Revert "Revert "Merge branch 'next'""

2014-02-17 21:06:46 +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