Merge branch 'master' into add-NotifyIcon

This commit is contained in:
NaBian committed 2019-03-24 18:01:31 +08:00
commit 53228907fc
76 files changed
+895 -697

No files matched your search

@@ -525,4 +525,10 @@
<data name="PleaseWait" xml:space="preserve">
<value>请稍后...</value>
</data>
<data name="GrowlDemo" xml:space="preserve">
<value>消息通知示例</value>
</data>
<data name="NewWindow" xml:space="preserve">
<value>新建窗口</value>
</data>
</root>