Commit Graph
8 Commits
Author SHA1 Message Date
bsongis 61224e7207 Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port
Conflicts:
	companion/src/eeprominterface.cpp
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxeeprom.cpp
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/firmwares/opentx/opentxinterface.h
	companion/src/mdichild.cpp
	radio/src/Makefile
2014-05-11 22:48:48 +02:00
bsongis c5ac19a054 Refactoring FirmwareInterface / EepromInterface 2014-04-18 16:27:27 +02:00
bsongis a1a82ad137 Cosmetics 2014-03-27 10:05:26 +01:00
bsongis a18953f6a2 Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port
Conflicts:
	companion/src/avroutputdialog.cpp
	companion/src/burnconfigdialog.cpp
	companion/src/eeprominterface.cpp
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/helpers.cpp
	radio/src/gui/menu_general.cpp
	radio/src/opentx.cpp
2014-03-03 16:41:41 +01:00
bsongis 1c482e7f6e Issue #757 fixed 2014-02-28 10:12:06 +01:00
Dvogonen e5ad887be9 companion9x renamed Companion 2014-01-05 02:23:06 +01:00
root ee1b51b214 9XR support n companion, still not finished 2013-12-21 15:45:05 +01:00
Bertrand Songis 2f8f2df3c7 Companion build on Linux 2013-12-02 18:47:43 +01:00