Merge branch 'master' into patch-3

This commit is contained in:
NaBian authored and GitHub committed 2018-11-21 19:04:50 +08:00
commit e21611b7f7
19 files changed
+321 -11

No files matched your search

@@ -414,4 +414,7 @@
<data name="RichTextBox" xml:space="preserve">
<value>RichTextBox</value>
</data>
</root>
<data name="ToolBar" xml:space="preserve">
<value>ToolBar</value>
</data>
</root>