Browse code Merge branch 'master' of http://192.168.0.203:8080/gitbucket/git/root/GHFX_REFACTOR Conflicts: Cyberpipe.suo MainFrm.designer.cs develop fuzhou fuzhouyq ganzhou master shouguang 1.1.0.0 1.0.0.0 1.0.0 0.1.0
commit 7aa2131e5c833f0b1b5ff0e242fa1eb30e6fd037 2 parents e994206 + bf7c632 xiaowei authored on 7 Mar 2017

Showing 27 changed files

• .merge_file_a10004
• ClassSearchAnalysis.cs
• Cyberpipe.csproj
• Cyberpipe.suo.orig
• EMS_Forms/Form_EventManager.cs
• FrmAllPipelineStatis.cs
• FrmAllWorkWellStatis.cs
• FrmBasicQuery.cs
• FrmCodingQuery.cs
• FrmDiameterQuery.cs
• FrmFittingQuery.cs
• FrmFlagEdits.cs
• FrmFlagManagers.cs
• FrmMaterialSel.cs
• FrmQuerySQL.cs
• FrmValveStatistics.cs
• Frmpipediameterstatis.cs
• MainFrm.cs
• MainFrm.designer.cs
• MainFrm.designer.cs.BACKUP.9524.cs
• MainFrm.designer.cs.BASE.9524.cs
• MainFrm.designer.cs.orig
• MainFrm.resx
• PaginationFeaturesUtil.cs
• PaginationUtil.cs
• bin/x86/Debug/glVersion.txt
• bin/x86/Debug/log.txt

Ignore Space Show notes View .merge_file_a10004 0 → 100644

Ignore Space Show notes View ClassSearchAnalysis.cs

Ignore Space Show notes View Cyberpipe.csproj

Ignore Space Show notes View Cyberpipe.suo.orig 0 → 100644
Not supported

Ignore Space Show notes View EMS_Forms/Form_EventManager.cs

Ignore Space Show notes View FrmAllPipelineStatis.cs

Ignore Space Show notes View FrmAllWorkWellStatis.cs

Ignore Space Show notes View FrmBasicQuery.cs

Ignore Space Show notes View FrmCodingQuery.cs

Ignore Space Show notes View FrmDiameterQuery.cs

Ignore Space Show notes View FrmFittingQuery.cs

Ignore Space Show notes View FrmFlagEdits.cs

Ignore Space Show notes View FrmFlagManagers.cs

Ignore Space Show notes View FrmMaterialSel.cs

Ignore Space Show notes View FrmQuerySQL.cs

Ignore Space Show notes View FrmValveStatistics.cs

Ignore Space Show notes View Frmpipediameterstatis.cs

Ignore Space Show notes View MainFrm.cs

Ignore Space Show notes View MainFrm.designer.cs

Ignore Space Show notes View MainFrm.designer.cs.BACKUP.9524.cs 0 → 100644

Ignore Space Show notes View MainFrm.designer.cs.BASE.9524.cs 0 → 100644

Ignore Space Show notes View MainFrm.designer.cs.orig 0 → 100644

Ignore Space Show notes View MainFrm.resx

Ignore Space Show notes View PaginationFeaturesUtil.cs 0 → 100644

Ignore Space Show notes View PaginationUtil.cs 0 → 100644

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