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

Browse Source

# Conflicts:
#	language/np3_zh_cn/menu_zh_cn.rc

...

This commit is contained in:

Rainer Kottenhoff 2018-11-05 09:58:52 +01:00

parent 6d82460615 44a9ebea0e

commit a0b39c2d2a

1 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_zh_cn/menu_zh_cn.rc

View File

Binary file not shown.