SIC1016\caipeilun 6b3d985945 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_configChangedV2 ... # Conflicts: # SicRT/Properties/AssemblyInfo.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		2023-10-20 16:32:28 +08:00
..
PM	Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_configChangedV2	2023-10-20 16:32:28 +08:00
Recipe/Sic	Recipe中取消Pyro选项	2023-10-19 08:33:55 +08:00
TM	修改TM的interlock DO-47 48 17 8 10 12 14 16	2023-09-28 14:38:55 +08:00