Files
edgetx-gx12/companion
bsongis f2ec3f215b Merge remote-tracking branch
'origin/dvogonen/move_firmware_selection_settings_988' into
bsongis/refactoring_firmware_interface

Conflicts:
	companion/src/apppreferencesdialog.cpp
	companion/src/apppreferencesdialog.h
2014-04-18 23:01:32 +02:00
..
2014-04-18 23:01:32 +02:00
2014-04-14 19:04:32 +02:00
2014-03-20 22:10:53 +01:00