Browse code Merge branch 'master' of http://192.168.0.203:8080/gitbucket/git/root/GHFX_REFACTOR Conflicts: Cyberpipe.suo MainFrm.designer.cs MainFrm.resx develop fuzhou fuzhouyq ganzhou master rkdw shouguang 1.1.0.0 1.0.0.0 1.0.0 0.1.0
commit 7c13ecd599343855713e7ad35e495828b16f17a4 2 parents 3cd8210 + e26bce8 wxn authored on 29 Nov 2016

Showing 15 changed files

• ClassExecuteSQL.cs
• Cyberpipe.csproj
• Forms/FrmPipelineModelDataBase.cs
• FrmAddWellShp.cs
• FrmAddWellShp.designer.cs
• FrmFlagEdits.cs
• FrmFlagManagers.cs
• FrmHDMAnalysis3.cs
• MainFrm.cs
• MainFrm.designer.cs
• MainFrm.resx
• bin/x86/Debug/Cyberpipe.vshost.exe.manifest
• bin/x86/Debug/EMSdatabaseConfig.xml
• bin/x86/Debug/glVersion.txt
• bin/x86/Debug/log/2016/201611/20161129.txt

Ignore Space Show notes View ClassExecuteSQL.cs

Ignore Space Show notes View Cyberpipe.csproj

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 FrmFlagEdits.cs

Ignore Space Show notes View FrmFlagManagers.cs

Ignore Space Show notes View FrmHDMAnalysis3.cs

Ignore Space Show notes View MainFrm.cs

Ignore Space Show notes View MainFrm.designer.cs

Ignore Space Show notes View MainFrm.resx

Ignore Space Show notes View bin/x86/Debug/Cyberpipe.vshost.exe.manifest 0 → 100644

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

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

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

Show line notes below