Merge branch 'master' into add-RelativePanel

This commit is contained in:
NaBian committed 2019-12-04 22:57:08 +08:00
commit af877ffc91
12 files changed
+68 -43

No files matched your search

@@ -13,5 +13,5 @@ using System.Windows;
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
[assembly: AssemblyVersion("2.3.0")]
[assembly: AssemblyVersion("2.4.0")]
#endif