SL 3531413790 Merge branch 'develop' into feature/single-session-login ... # Conflicts: # SicRT/Properties/AssemblyInfo.cs # SicRT/ReleaseNotes.md # SicUI/MainView.xaml # SicUI/MainViewModel.cs # SicUI/Properties/AssemblyInfo.cs # ThirdParty/MECF.Framework/MECF.Framework.Common.dll # ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll # ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll # ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll # ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll # ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll # ThirdParty/MECF.Framework/Sicentury.Core.dll		2023-10-01 16:34:16 +08:00
..
Sic_Setup	Merge branch 'develop' into feature/single-session-login	2023-10-01 16:34:16 +08:00