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

Merge branch 'next' into schwabe/spektrum_dsm2_bind

Browse Source 
# Conflicts:
#	radio/src/translations/de.h.txt
This commit is contained in:
Andre Bernet
2016-10-21 19:36:31 +02:00
parent e13dd6490d 186634cc08
commit 978867d509
92 changed files with 11238 additions and 9185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations.cpp
+3
View File
@@ -492,6 +492,9 @@ const pm_char STR_MODELS_PATH[] PROGMEM = MODELS_PATH;
const pm_char STR_MODELS_EXT[] PROGMEM = MODELS_EXT;
#endif
const pm_char STR_DELETE_ERROR[] PROGMEM = TR_DELETE_ERROR;
const pm_char STR_CAT_NOT_EMPTY[] PROGMEM = TR_CAT_NOT_EMPTY;
const pm_char STR_WARNING[] PROGMEM = TR_WARNING;
const pm_char STR_THROTTLEWARN[] PROGMEM = TR_THROTTLEWARN;
const pm_char STR_ALARMSWARN[] PROGMEM = TR_ALARMSWARN;