合并自hefangli.master #5

Merged
merged 7 commits into from Oct 23, 2012

Conversation

Projects
None yet
2 participants
@katway
Owner

katway commented Oct 23, 2012

No description provided.

katway and others added some commits Oct 12, 2012

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
修正由hfl提交来的命名空间
1.命名空间由Application改为WorkStation
2.加载Model项目,改为卸载状态
Merge pull request #1 from katway/Develop
由Katway下Develop分支来的合并

katway added a commit that referenced this pull request Oct 23, 2012

Merge pull request #5 from hefangli/master
合并自hefangli.master

@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