DESKTOP-1N1NK8A\auvkk 8782215da1 Merge branch 'feature/update-signal-tower' into develop ... # Conflicts: # 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-05-08 15:03:53 +08:00
..
DeviceModelPM2.xml	Merge branch 'feature/update-signal-tower' into develop	2023-05-08 15:03:53 +08:00
_ioDefinePM2.xml	更新库文件以引用新的三色灯对象。	2023-05-05 11:42:39 +08:00
interlockPM2.xml	Update from svn.	2023-03-28 13:24:11 +08:00