Merge branch 'origin/next'

This commit is contained in:
Dvogonen
2014-01-21 14:57:13 +01:00
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -295,3 +295,4 @@ Eric Jacquin
Harvest Lane
Ville Kuvaja
DK-System
Heinz Vogel
+1 -1
View File
@@ -702,7 +702,7 @@ void RegisterFirmwares()
#ifndef __APPLE__
firmwares.push_back(new FirmwareInfo("ersky9x", QObject::tr("ersky9x"), new Ersky9xInterface(), "http://ersky9x.googlecode.com/svn/trunk/ersky9x_rom.bin", ERSKY9X_STAMP));
#endif
default_firmware_variant = GetFirmwareVariant("opentx-stock-heli-templates-en");
default_firmware_variant = GetFirmwareVariant("opentx-9x-heli-templates-en");
RegisterEepromInterfaces();
}