Browse code Merge branch 'master' of http://192.168.0.203:8080/gitbucket/git/root/GHFX_REFACTOR Conflicts: Cyberpipe.suo MainFrm.designer.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 8d9b66a09c8c6222276f7aa7fff9c5e7ff8e4ed7 2 parents 2fb83ec + 316415b wxn authored on 21 Nov 2016

Showing 29 changed files

• ClassAddMakerToGlobel.cs
• ClassDataTableParam.cs
• ClassDoubleScreenCompare.cs
• ClassYJSHAlgorithm.cs
• ClassYJSHModel.cs
• Cyberpipe.csproj
• DoublePanelAnalysis.cs
• Forms/FrmMnModify.cs
• Forms/FrmPipelineModelDataBase.cs
• Forms/FrmShLayers.Designer.cs
• Forms/FrmShLayers.cs
• Forms/FrmShLayers.resx
• FrmAddWellShp.cs
• FrmShResult.Designer.cs
• FrmShResult.cs
• FrmValiData.Designer.cs
• FrmValiData.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
• Program.cs
• ShResult.cs
• ValidateInfo.cs
• bin/x86/Debug/FieldValidate.xml
• bin/x86/Debug/glVersion.txt
• bin/x86/Debug/log/2016/201611/20161121.txt

Ignore Space Show notes View ClassAddMakerToGlobel.cs 0 → 100644

Ignore Space Show notes View ClassDataTableParam.cs 0 → 100644

Ignore Space Show notes View ClassDoubleScreenCompare.cs

Ignore Space Show notes View ClassYJSHAlgorithm.cs 0 → 100644

Ignore Space Show notes View ClassYJSHModel.cs

Ignore Space Show notes View Cyberpipe.csproj

Ignore Space Show notes View DoublePanelAnalysis.cs

Ignore Space Show notes View Forms/FrmMnModify.cs

Ignore Space Show notes View Forms/FrmPipelineModelDataBase.cs

Show notes View Forms/FrmShLayers.Designer.cs 100644 → 0

Show notes View Forms/FrmShLayers.cs 100644 → 0

Show notes View Forms/FrmShLayers.resx 100644 → 0

Ignore Space Show notes View FrmAddWellShp.cs

Ignore Space Show notes View FrmShResult.Designer.cs

Ignore Space Show notes View FrmShResult.cs

Ignore Space Show notes View FrmValiData.Designer.cs

Ignore Space Show notes View FrmValiData.cs

Ignore Space Show notes View MainFrm.cs

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

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

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

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

Ignore Space Show notes View MainFrm.designer.cs

Ignore Space Show notes View Program.cs

Ignore Space Show notes View ShResult.cs

Ignore Space Show notes View ValidateInfo.cs

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

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

Ignore Space Show notes View bin/x86/Debug/log/2016/201611/20161121.txt 0 → 100644

Show line notes below