 Bertrand Songis
|
53c670deee
|
Merge remote-tracking branch 'origin/next' into
bsongis/Issue554_trims_relative_default
Conflicts:
radio/src/gui/menu_model.cpp
|
2014-02-01 19:56:31 +01:00 |
|
|
Andre Bernet
|
856ffd4ed7
|
Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts:
companion/src/firmwares/opentx/opentxeeprom.cpp
radio/src/gui/menu_model.cpp
radio/src/opentx.cpp
radio/src/telemetry/frsky.cpp
radio/src/translations.cpp
radio/src/translations.h
radio/src/translations/cz.h.txt
radio/src/translations/de.h.txt
radio/src/translations/en.h
radio/src/translations/es.h.txt
radio/src/translations/fr.h.txt
radio/src/translations/it.h.txt
radio/src/translations/pl.h.txt
radio/src/translations/pt.h.txt
radio/src/translations/se.h.txt
|
2014-02-01 13:19:27 +01:00 |
|
|
Bertrand Songis
|
38145a02f4
|
Merge remote-tracking branch 'origin/next' into
bsongis/Taranis_6Positions_Pot
Conflicts:
radio/src/myeeprom.h
|
2014-01-31 11:28:34 +01:00 |
|
|
Bertrand Songis
|
cde59a2b22
|
[Taranis] Issue #554 - Automatic EEPROM conversions
|
2014-01-27 14:32:19 +01:00 |
|
|
Bertrand Songis
|
fc716b3a2a
|
Issue #488. Firmware part done
|
2014-01-22 17:31:21 +01:00 |
|
|
Andre Bernet
|
0b2b9ea1c3
|
Merge branch 'next' into kilrah/Switch_and_pot_warnings
Conflicts:
radio/src/myeeprom.h
radio/src/translations/cz.h
radio/src/translations/de.h
radio/src/translations/es.h
radio/src/translations/fr.h
radio/src/translations/fr.h.txt
radio/src/translations/it.h
radio/src/translations/pl.h
radio/src/translations/pt.h
radio/src/translations/se.h
|
2014-01-15 22:16:16 +01:00 |
|
|
Bertrand Songis
|
cedddfe8d2
|
EEPROM 'next' support. A lot of corrections.
|
2014-01-13 19:09:05 +01:00 |
|
|
Bertrand Songis
|
96e1dcbcd8
|
Issue #193 fixed (curves names shifted)
|
2014-01-10 15:57:25 +01:00 |
|
|
Bertrand Songis
|
1c8b865d89
|
[Taranis] Support for the 6POS Pots
|
2013-12-31 13:02:53 +01:00 |
|
|
Bertrand Songis
|
b2db04f4bb
|
Visual C++ compilation
|
2013-12-02 21:13:42 +01:00 |
|
|
Bertrand SongisandAndre Bernet
|
9a57ec0acc
|
Directory transmitter renamed to radio
|
2013-12-02 12:10:47 +01:00 |
|
|
Bertrand Songis
|
942e658c8e
|
Directory transmitter renamed to radio
|
2013-12-02 07:13:57 +01:00 |
|