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 |
|
Kjell Kernen
|
bb4bca8125
|
Two more missing dialog icons (these are the last I can find)
|
2014-03-17 17:25:58 +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 |
|
Kjell Kernen
|
80ef2b8d38
|
All function names changed to a consistent standard.
Cleaned up indentation of appdata.h
|
2014-02-19 14:01:34 +01:00 |
|
Kjell Kernen
|
da68c593cf
|
Changed every single QSetting in Companion.
Next step: Function renaming
|
2014-02-18 23:48:57 +01:00 |
|
Bertrand Songis
|
439cabe83c
|
Another code reduction. Settings are now stored in "OpenTX/Companion",
instead of "companion/companion"
|
2014-01-20 16:50:06 +01:00 |
|
Romolo Manfredini
|
97de97c84e
|
Small code cleanup
|
2014-01-20 12:26:50 +01:00 |
|
Romolo Manfredini
|
fad6211789
|
Remove duplicated code
|
2014-01-20 00:56:14 +01:00 |
|
Romolo Manfredini
|
034130555e
|
Companion now should fully support themes
|
2014-01-20 00:05:16 +01:00 |
|
Dvogonen
|
9fd20a87fe
|
Fixes #511
|
2014-01-15 21:54:43 +01:00 |
|
Dvogonen
|
e5ad887be9
|
companion9x renamed Companion
|
2014-01-05 02:23:06 +01:00 |
|
 romoloman@github.comandromoloman@github.com
|
4eedf94f03
|
9XR support n companion, still not finished
|
2013-12-21 20:05:20 +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 |
|