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
..
MfcDeviationValue	移植调机已知问题	2023-06-30 08:45:58 +08:00
MfcRor	1.Mfc Ror问题点更新	2023-07-18 08:43:33 +08:00
PM1	Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_configChangedV2	2023-10-20 16:32:28 +08:00
PM2	Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_configChangedV2	2023-10-20 16:32:28 +08:00