Sic-Software
/
Sic10
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
Sic10/SicRT/Instances
History
SIC1016\caipeilun 78582fc288 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into feature/维保界面V1.0 
# Conflicts:
#	SicRT/Properties/AssemblyInfo.cs
#	SicRT/ReleaseNotes.md
#	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.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 		2024-02-23 09:01:35 +08:00
..
App.xaml Repo Init 2023-05-10 10:26:01 +08:00
App.xaml.cs Repo Init 2023-05-10 10:26:01 +08:00
RtInstance.cs Repo Init 2023-05-10 10:26:01 +08:00
ToolLoader.cs Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into feature/维保界面V1.0 2024-02-23 09:01:35 +08:00