Merge remote-tracking branch 'origin/next' into

bsongis/Issue554_trims_relative_default

Conflicts:
	companion/src/eeprominterface.h
	companion/src/firmwares/er9x/er9xinterface.cpp
	companion/src/firmwares/ersky9x/ersky9xinterface.cpp
This commit is contained in:
Bertrand Songis
2014-01-31 22:15:23 +01:00
28 changed files with 773 additions and 2204 deletions
@@ -281,8 +281,6 @@ int Er9xInterface::getCapability(const Capability capability)
case ModelVoice:
case Gvars:
return 7;
case GvarsAsSources:
return 1;
case GetThrSwitch:
return DSW_THR;
default: