Notepad3/language
Rainer Kottenhoff 0db0d237cc Merge branch 'Dev_RC2_UTF8' into Dev_AccelKeys
# Conflicts:
#	ced/ced/compact_enc_det/compact_enc_det.cc
#	ced/targetver.h
#	language/common_res.h
#	language/common_res.rc
#	language/np3_af_za/dialogs_af_za.rc
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/dialogs_be_by.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/dialogs_de_de.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/dialogs_en_gb.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/dialogs_en_us.rc
#	language/np3_en_us/np3_en_us.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/dialogs_es_es.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/dialogs_fr_fr.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/dialogs_ja_jp.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/dialogs_nl_nl.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/dialogs_ru_ru.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/dialogs_zh_cn.rc
#	language/np3_zh_cn/menu_zh_cn.rc
#	language/np3_zh_cn/resource.h
#	language/np3_zh_cn/strings_zh_cn.rc
#	minipath/src/minipath.rc
#	np3encrypt/targetver.h
#	src/Dialogs.h
2018-11-15 15:58:09 +01:00
..
np3_af_za + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
np3_be_by + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
np3_de_de + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
np3_en_gb + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
np3_en_us Merge branch 'Dev_RC2_UTF8' into Dev_AccelKeys 2018-11-15 15:58:09 +01:00
np3_es_es + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
np3_fr_fr + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
np3_ja_jp + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
np3_nl_nl + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
np3_ru_ru + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
np3_zh_cn + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
common_res.h Merge branch 'Dev_RC2_UTF8' into Dev_AccelKeys 2018-11-15 15:58:09 +01:00
common_res.rc + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
DoReverseMuiLoc.cmd + add: post build steps to create Split MUI files and single control resource dll 2018-05-14 21:47:58 +02:00
DoReverseMuiLoc.rcconfig + add: post build steps to create Split MUI files and single control resource dll 2018-05-14 21:47:58 +02:00