Files
edgetx-gx12/radio
bsongis cdce9b0da7 Merge remote-tracking branch 'origin/next' into
bsongis/Issue524_SPORT_GPS

Conflicts:
	radio/src/telemetry/frsky_sport.cpp
	radio/src/translations/de.h.txt
2014-03-03 15:36:34 +01:00
..