You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
lj_plc/Main/MCEdit
nodyang dfe261ff96 Merge branch 'dep' into dep1011
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
#	Main/MCEdit/MCEdit.csproj
1 year ago
..
Data Merge branch 'dep' into dep1011 1 year ago
Localization 添加项目文件。 2 years ago
Properties add - 输送监视图完成 点位开始维护 换电脑 1 year ago
Resources/Mesnac.Action.Feeding 添加项目文件。 2 years ago
images 添加项目文件。 2 years ago
App.config change - 重构手动控制 完善日志 添加焦点控制 1 year ago
MCEdit.csproj 修复一个版本 1 year ago
Program.cs 修改plc 1 year ago
packages.config add - 手动控制等待引入PLC 1 year ago