piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into mhotar/modelsetup_items

Browse Source 
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
This commit is contained in:
mhotar
2014-03-04 02:13:15 +01:00
parent 13a2fdfc00 9bb64c07ae
commit df462447e0
55 changed files with 867 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ const pm_char STR_OPEN9X[] PROGMEM =
#if defined(FRSKY) || defined(CPUARM)
#if defined(CPUARM)
ISTR(VTELEMUNIT_IMP)
ISTR(VTELEMUNIT_NORM)
ISTR(VTELEMUNIT_METR)
#else
ISTR(VTELEMUNIT)
#endif