Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_ChooseFont

Browse Source

# Conflicts:
#	language/np3_af_za/strings_af_za.rc
#	language/np3_es_es/strings_es_es.rc

...

This commit is contained in:

Rainer Kottenhoff 2018-08-14 18:23:00 +02:00

parent a86a05200f a6d708e6e3

commit ce3cb6a588

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available