Commit Graph
7334 Commits
Author SHA1 Message Date
bsongis 1d181ae300 one more file removed 2014-03-05 11:46:50 +01:00
bsongis 55349d46da 5 more files removed 2014-03-05 11:45:57 +01:00
bsongis 5b0835cecb translations.h/.cpp files splitted into translations.h/.ccp and
fonts.h/.cpp
2014-03-05 10:59:52 +01:00
mhotar 708411c272 EN,FR translations 2014-03-04 23:08:18 +01:00
mhotar 3f231585a9 Neverending conflicts 2014-03-04 22:52:37 +01:00
mhotar 4cc6b6f8aa Merge branch 'next' into mhotar/modelsetup_items
Conflicts:
	radio/src/translations/en.h.txt
	radio/src/translations/fr.h.txt
2014-03-04 22:46:22 +01:00
mhotar 21f2130d13 TR_POTTYPES "None" in cz.h.txt 2014-03-04 22:31:41 +01:00
mhotar b919773b56 TR_POTTYPES "None" was missing in some translations 2014-03-04 22:26:15 +01:00
mhotar b506259d76 Conflicts fix 2014-03-04 21:52:54 +01:00
bsongis 3788f5f562 5 more files removed 2014-03-04 18:31:12 +01:00
bsongis 9cdd175250 4 more files removed 2014-03-04 17:58:57 +01:00
bsongis dc3ea6b555 one more file removed 2014-03-04 17:56:52 +01:00
bsongis 51fe47ed8a 3 files removed 2014-03-04 17:14:35 +01:00
bsongis 74872b1322 18 more files removed 2014-03-04 15:58:01 +01:00
bsongis b7e079a0d9 2 files removed 2014-03-04 15:33:26 +01:00
bsongis ae54f4908a More Sky9x bootloader files removed 2014-03-04 12:07:43 +01:00
bsongis 7853aebf3d 1 more file removed 2014-03-04 12:03:34 +01:00
bsongis e7c08e56b2 Sky9x files removed for now 2014-03-04 11:29:41 +01:00
bsongis c482eef8d2 2 other files removed 2014-03-04 10:50:15 +01:00
bsongis d5b83e1b4e 7 files removed 2014-03-04 10:41:04 +01:00
bsongis 92436f47f7 PCBX9D replaced everywhere by PCBTARANIS 2014-03-04 09:26:52 +01:00
bsongis e0b8e55e73 French translations aligned 2014-03-04 07:28:12 +01:00
mhotar df462447e0 Merge branch 'next' into mhotar/modelsetup_items
Conflicts:
	radio/src/translations.cpp
	radio/src/translations.h
	radio/src/translations/de.h.txt
	radio/src/translations/en.h.txt
	radio/src/translations/fr.h.txt
2014-03-04 02:13:15 +01:00
mhotar 13a2fdfc00 indentations and ifdef corrected 2014-03-03 23:48:49 +01:00
bsongis 9bb64c07ae Align french translations 2014-03-03 22:57:46 +01:00
bsongis 7435416422 More cleaning in bootloader 2014-03-03 21:31:34 +01:00
bsongis b90cff13b4 Some duplicated files removed 2014-03-03 17:57:36 +01:00
bsongis b6b2569190 Merge remote-tracking branch 'origin/next' into kilrah/Bootloader
Conflicts:
	radio/src/Makefile
2014-03-03 17:14:12 +01:00
bsongis 8662a4ec68 Merge issues 2014-03-03 16:50:32 +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 145c741307 Warnings fixed 2014-03-03 15:56:59 +01:00
Bertrand Songis 8a0dc22578 Merge pull request #770 from opentx/bsongis/Issue767_extra_pot
Bsongis/issue767 extra pot
2014-03-03 15:44:59 +01:00
bsongis 88b7374c6c Compilation error 2014-03-03 15:42:13 +01:00
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
bsongis c8f1758bc1 Conversion of °C->°F on HDG
Altitude stored as feet in logs when imperial mode chosen
2014-03-03 15:33:26 +01:00
bsongis e59ebed474 Issue #534 missing control 2014-03-02 15:44:34 +01:00
bsongis aed219cbd1 EEPROM conversions problems 2014-03-02 14:35:42 +01:00
mhotar 61bb02ceea Thr grouping for Taranis only 2014-03-01 23:32:05 +01:00
bsongis e5cfef711f Vario didn't stop beeping when in sink mode 2014-03-01 22:25:06 +01:00
bsongis 3215346a1b Issue #767 - Extra Pot (S3) support 2014-03-01 18:54:08 +01:00
bsongis f9e6819b37 Ignore list updated 2014-03-01 08:48:42 +01:00
bsongis 35b2346ba8 DE translations 2014-03-01 08:45:06 +01:00
mhotar 83651486f4 Translations updated 2014-03-01 02:08:45 +01:00
mhotar 55ff2e6b5e Throttle label and missing string defs 2014-03-01 01:20:47 +01:00
mhotar 4506328144 Preflight check label and items 2014-03-01 00:25:18 +01:00
bsongis dcb52913a5 Merge branch 'next' of https://github.com/opentx/opentx into next 2014-02-28 23:19:01 +01:00
bsongis 09e427d73e Indentation issues 2014-02-28 23:18:21 +01:00
Andre Bernet 4d66fd8061 PPMx were missing in Inputs source list 2014-02-28 15:07:34 +01:00
Andre Bernet 3ab86c90a6 Sky9x support for 16CH input on trainer port (untested) 2014-02-28 13:51:18 +01:00
Andre Bernet c2912eb5e1 French translation fix 2014-02-28 13:18:03 +01:00