Merge branch 'bsongis/Issue660' into next

Conflicts:
	companion/src/firmwares/opentx/opentxinterface.cpp
This commit is contained in:
Andre Bernet
2014-05-02 14:44:24 +02:00
15 changed files with 458 additions and 337 deletions
+1
View File
@@ -486,6 +486,7 @@ class GeneralSettings {
int PPM_Multiplier;
int hapticLength;
unsigned int reNavigation;
unsigned int stickReverse;
bool hideNameOnSplash;
bool enablePpmsim;
unsigned int speakerPitch;