Skip to content

合并自hefangli.master #5

Merged
merged 7 commits into from Oct 23, 2012

2 participants

@katway
Owner
katway commented Oct 23, 2012

No description provided.

and others added some commits Oct 12, 2012
@katway 添加主界面(初步模板) f91a92f
@katway Merge branch 'hefl' into Develop
Conflicts:
	Application/Form1.Designer.cs
	Application/Program.cs
	Application/Properties/Resources.Designer.cs
	Application/Properties/Settings.Designer.cs
	Application/WorkStation.csproj
	PartolCheck.sln
e12712c
@katway 修正由hfl提交来的命名空间
1.命名空间由Application改为WorkStation
2.加载Model项目,改为卸载状态
c8d549b
@hefangli hefangli Merge pull request #1 from katway/Develop
由Katway下Develop分支来的合并
b0ba721
@hefangli hefangli 卡片的新建,编辑删除等的功能 5861de5
@hefangli hefangli 修改巡检项,巡检点,巡检路线,卡片管理等的页面,及为卡片管理的“用途”增加进程的内容。 af71e0b
@hefangli hefangli 厂区的新建,编辑及删除的功能提交 86cf58c
@katway katway merged commit 172c237 into katway:hefl Oct 23, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.