Browse code Merge branch 'master' of http://192.168.0.203:8080/gitbucket/git/root/GHFX_REFACTOR Conflicts: Cyberpipe.suo develop fuzhou fuzhouyq ganzhou master shouguang 1.1.0.0 1.0.0.0 1.0.0 0.1.0
commit d81e6cfdcc45fc7a04bdfa4be20d11323c9848c7 2 parents 9525361 + cc0bc4f xiaowei authored on 16 Dec 2016

Showing 16 changed files

• EMS_Forms/Form_EventManager.cs
• EMS_Forms/Form_TaskManager.cs
• FrmEquipmentManage.cs
• FrmLogin.cs
• FrmPatrolerManager.cs
• FrmRoleInfoManager.cs
• FrmRoleRescManager.cs
• FrmSysUserInfoManger.cs
• FrmUserRole.cs
• MainFrm.cs
• MainFrm.designer.cs
• Program.cs
• SysRescInfoManager.cs
• Utility.cs
• bin/x86/Debug/glVersion.txt
• bin/x86/Debug/log.txt

Ignore Space Show notes View EMS_Forms/Form_EventManager.cs

Ignore Space Show notes View EMS_Forms/Form_TaskManager.cs

Ignore Space Show notes View FrmEquipmentManage.cs

Ignore Space Show notes View FrmLogin.cs

Ignore Space Show notes View FrmPatrolerManager.cs

Ignore Space Show notes View FrmRoleInfoManager.cs

Ignore Space Show notes View FrmRoleRescManager.cs

Ignore Space Show notes View FrmSysUserInfoManger.cs

Ignore Space Show notes View FrmUserRole.cs

Ignore Space Show notes View MainFrm.cs

Ignore Space Show notes View MainFrm.designer.cs

Ignore Space Show notes View Program.cs

Ignore Space Show notes View SysRescInfoManager.cs

Ignore Space Show notes View Utility.cs

Ignore Space Show notes View bin/x86/Debug/glVersion.txt
Not supported

Ignore Space Show notes View bin/x86/Debug/log.txt

Show line notes below