Browse code Merge branch 'master' of http://192.168.0.203:8080/gitbucket/git/root/GHFX_REFACTOR Conflicts: Cyberpipe.suo MainFrm.cs bin/x86/Debug/Cyberpipe.exe bin/x86/Debug/Cyberpipe.pdb develop fuzhou fuzhouyq ganzhou master rkdw shouguang 1.1.0.0 1.0.0.0 1.0.0 0.1.0
commit d894854f6994f5b2364a438ca7648f5ced1352be 2 parents c730a87 + 1dd0197 wxn authored on 7 Nov 2016

Showing 24 changed files

• BaseParam.cs
• Forms/FrmPipelineModelDataBase.Designer.cs
• Forms/FrmPipelineModelDataBase.cs
• FrmAddWellShp.cs
• FrmAddWellShp.designer.cs
• FrmBasicQuery.cs
• FrmCodingQuery.cs
• FrmDiameterQuery.cs
• FrmFittingQuery.cs
• FrmKeywordQuery.cs
• FrmMaterialSel.cs
• LineBuilder.cs
• MainFrm.cs
• MainFrm.cs.BACKUP.9016.cs
• MainFrm.cs.BASE.9016.cs
• MainFrm.cs.LOCAL.9016.cs
• MainFrm.cs.REMOTE.9016.cs
• MainFrm.designer.cs
• MainFrm.resx
• PointBuilder.cs
• bin/x86/Debug/Config.xml
• bin/x86/Debug/Cyberpipe.vshost.exe.manifest
• bin/x86/Debug/glVersion.txt
• bin/x86/Debug/log.txt

Ignore Space Show notes View BaseParam.cs

Ignore Space Show notes View Forms/FrmPipelineModelDataBase.Designer.cs

Ignore Space Show notes View Forms/FrmPipelineModelDataBase.cs

Ignore Space Show notes View FrmAddWellShp.cs

Ignore Space Show notes View FrmAddWellShp.designer.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 FrmKeywordQuery.cs

Ignore Space Show notes View FrmMaterialSel.cs

Ignore Space Show notes View LineBuilder.cs

Ignore Space Show notes View MainFrm.cs

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

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

Ignore Space Show notes View MainFrm.cs.LOCAL.9016.cs 0 → 100644

Ignore Space Show notes View MainFrm.cs.REMOTE.9016.cs 0 → 100644

Ignore Space Show notes View MainFrm.designer.cs

Ignore Space Show notes View MainFrm.resx

Ignore Space Show notes View PointBuilder.cs

Ignore Space Show notes View bin/x86/Debug/Config.xml

Ignore Space Show notes View bin/x86/Debug/Cyberpipe.vshost.exe.manifest 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