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 rkdw shouguang 1.1.0.0 1.0.0.0 1.0.0 0.1.0
commit eeb9b74f6047d4449410cc97fa470557a3592b4e 2 parents b063710 + 4f0e85c wxn authored on 18 Nov 2016

Showing 12 changed files

• Cyberpipe.csproj
• Forms/FrmPipelineModelDataBase.cs
• MainFrm.cs
• Program.cs
• ValidateInfo.cs
• bin/x86/Debug/FieldValidate.xml
• bin/x86/Debug/config/log4net.config
• bin/x86/Debug/glVersion.txt
• bin/x86/Debug/log.txt
• bin/x86/Debug/log/2016/201611/20161118.txt
• bin/x86/Debug/office.dll
• bin/x86/Debug/office.xml

Ignore Space Show notes View Cyberpipe.csproj

Ignore Space Show notes View Forms/FrmPipelineModelDataBase.cs

Ignore Space Show notes View MainFrm.cs

Ignore Space Show notes View Program.cs

Ignore Space Show notes View ValidateInfo.cs 0 → 100644

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

Show notes View bin/x86/Debug/config/log4net.config 100644 → 0

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

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

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

Show notes View bin/x86/Debug/office.dll 100644 → 0
Not supported

Show notes View bin/x86/Debug/office.xml 100644 → 0

Show line notes below