Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_0917

Browse Source

# Conflicts:
#	language/np3_fr_fr/menu_fr_fr.rc
#	language/np3_nl_nl/menu_nl_nl.rc

...

This commit is contained in:

Rainer Kottenhoff 2018-09-18 13:51:01 +02:00

parent e20a7b6d41 a801b8796f

commit 2f0d0eaa40

2 changed files with 0 additions and 0 deletions

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

BIN

language/np3_fr_fr/menu_fr_fr.rc

View File

Binary file not shown.

BIN

language/np3_nl_nl/menu_nl_nl.rc

View File

Binary file not shown.