Files
edgetx-gx12/radio
Andre Bernet 06a2e757f1 Merge branch 'next' into kilrah/FAS_Offset_compensation
Conflicts:
	companion/src/modeledit.ui
	radio/src/translations/cz.h
	radio/src/translations/de.h
	radio/src/translations/fr.h
	radio/src/translations/it.h
	radio/src/translations/pl.h
	radio/src/translations/pt.h
	radio/src/translations/se.h
2014-01-15 16:02:32 +01:00
..