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

..

bitmaps

.lbm's weren't actually untracked

2014-01-23 22:08:27 +01:00

CoOS

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

FatFs

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

fonts

delta character bitmaps

2014-02-27 12:01:38 +01:00

GCS_MAVLink

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

gui

Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port

2014-03-03 16:41:41 +01:00

lua

Revert "Revert "Merge branch 'next'""

2014-02-17 21:06:46 +01:00

protocols

Merge branch 'bsongis/Taranis_audio_freeze' of https://github.com/opentx/opentx into next

2014-01-05 12:26:14 +01:00

targets

Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port

2014-03-03 16:41:41 +01:00

telemetry

Compilation error

2014-03-03 15:42:13 +01:00

translations

Merge pull request #770 from opentx/bsongis/Issue767_extra_pot

2014-03-03 15:44:59 +01:00

.gitignore

Ignore list updated

2014-03-01 08:48:42 +01:00

audio_arm.cpp

Merge pull request #770 from opentx/bsongis/Issue767_extra_pot

2014-03-03 15:44:59 +01:00

audio_arm.h

Merge branch 'next' of https://github.com/opentx/opentx into bsongis/vario_improvements

2014-02-25 19:02:36 +01:00

audio_avr.cpp

Indentation fixed so that cpplint is ok

2014-02-26 15:22:27 +01:00

audio_avr.h

Compilation was broken

2014-02-21 15:54:53 +01:00

bmp.cpp

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

buzzer.cpp

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

buzzer.h

No more parsing of all system sounds. Automatic prompts silent after

2014-02-21 16:40:52 +01:00

debug.cpp

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

debug.h

UART3 Debug/SPORT modes

2014-02-01 19:50:49 +01:00

eeprom_common.cpp

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

eeprom_common.h

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

eeprom_conversions.cpp

EEPROM conversions problems

2014-03-02 14:35:42 +01:00

eeprom_raw.cpp

Indentation fixed so that cpplint is ok

2014-02-26 15:22:27 +01:00

eeprom_raw.h

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

eeprom_rlc.cpp

Indentation fixed so that cpplint is ok

2014-02-26 15:22:27 +01:00

eeprom_rlc.h

Indentation fixed so that cpplint is ok

2014-02-26 15:22:27 +01:00

fifo.h

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

gtests.cpp

Mixer slow bug (source=MAX, switch, slow up, no slow down)

2014-02-26 21:19:47 +01:00

haptic.cpp

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

haptic.h

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

keys.cpp

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

lcd.cpp

Merge remote-tracking branch 'origin/next' into

2014-03-03 15:36:34 +01:00

lcd.h

Issue #592 - 422bytes saved on 9x stock!!!

2014-02-06 15:57:59 +01:00

logs.cpp

Merge pull request #770 from opentx/bsongis/Issue767_extra_pot

2014-03-03 15:44:59 +01:00

lua.cpp

More custom scripts (7 instead of 3)

2014-02-19 16:41:18 +01:00

Makefile

Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port

2014-03-03 16:41:41 +01:00

maths.cpp

Warnings fixed

2014-03-03 15:56:59 +01:00

myeeprom.h

Merge pull request #770 from opentx/bsongis/Issue767_extra_pot

2014-03-03 15:44:59 +01:00

opentx.cpp

Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port

2014-03-03 16:41:41 +01:00

opentx.h

Issue #767 - Extra Pot (S3) support

2014-03-01 18:54:08 +01:00

pgmtypes.h

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

rtc.cpp

Indentation fixed so that cpplint is ok

2014-02-26 15:22:27 +01:00

rtc.h

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

sdcard.h

No more parsing of all system sounds. Automatic prompts silent after

2014-02-21 16:40:52 +01:00

serial.cpp

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

serial.h

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

simpgmspace.cpp

Merge remote-tracking branch 'origin/next' into

2014-02-21 14:26:11 +01:00

simpgmspace.h

UART3 Debug/SPORT modes

2014-02-01 19:50:49 +01:00

simu.cpp

Issue #767 - Extra Pot (S3) support

2014-03-01 18:54:08 +01:00

stamp.cpp

pointer and ":" fix

2014-02-04 20:25:35 +01:00

templates.cpp

Renaming started ... who wants to continue?

2014-02-08 08:38:06 +01:00

templates.h

Indentation fixed so that cpplint is ok

2014-02-26 15:22:27 +01:00

translations.cpp

Merge pull request #770 from opentx/bsongis/Issue767_extra_pot

2014-03-03 15:44:59 +01:00

translations.h

Merge pull request #770 from opentx/bsongis/Issue767_extra_pot

2014-03-03 15:44:59 +01:00