Notepad3/np3portableapp/Notepad3Portable
Rainer Kottenhoff cac3b71b30 Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys
# Conflicts:
#	language/common_res.rc
#	language/np3_af_za/dialogs_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_us/dialogs_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/strings_zh_cn.rc
2018-11-13 08:43:07 +01:00
..
App Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys 2018-11-13 08:43:07 +01:00
Other + chg: preparations for PortableApps.com distribution 2018-11-08 17:50:11 +01:00
help.html + chg: preparations for PortableApps.com distribution 2018-11-08 17:50:11 +01:00