HCL 90496c2714 Merge branch 'GEM' into feature/KX_GEM ... # Conflicts: # SicRT/Equipments/AutoTransfer.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.Localization.dll # ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll		2024-05-08 09:51:42 +08:00
..
IODefinePlatform.xml	Merge branch 'KX_GEM' into GEM	2024-04-17 16:37:52 +08:00
UILayout.xml	Repo Init	2023-05-10 10:26:01 +08:00
_ioDefinePM.xml	Merge branch 'GEM' into feature/KX_GEM	2024-05-08 09:51:42 +08:00