Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys

# Conflicts:
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/strings_zh_cn.rc
This commit is contained in:
Rainer Kottenhoff 2018-11-08 13:03:58 +01:00
commit 8382a0097b
11 changed files with 0 additions and 0 deletions