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 abe2f0e9d4743f1359610b4b3f6ed48a2123bfd8 2 parents e8521dc + d2d0088 xiaowei authored on 7 Nov 2016

Showing 20 changed files

• Cyberpipe.csproj
• FeatureStatisticsService.cs
• FrmAllWorkWellStatis.cs
• FrmBSQDuoBianXingStatis.Designer.cs
• FrmBSQDuoBianXingStatis.cs
• FrmBSQDuoBianXingStatis.resx
• FrmBSQStatis.Designer.cs
• FrmBSQStatis.cs
• FrmValveStatistics.cs
• FrmpipeDeepstatis.cs
• FrmpipeMaterialGather.cs
• Frmpipediameterstatis.cs
• MainFrm.cs
• MainFrm.cs.BACKUP.9016.cs
• MainFrm.cs.BASE.9016.cs
• MainFrm.cs.LOCAL.9016.cs
• MainFrm.cs.REMOTE.9016.cs
• bin/x86/Debug/Cyberpipe.vshost.exe.manifest
• bin/x86/Debug/glVersion.txt
• bin/x86/Debug/log/2016/201611/20161107.txt

Ignore Space Show notes View Cyberpipe.csproj

Ignore Space Show notes View FeatureStatisticsService.cs

Ignore Space Show notes View FrmAllWorkWellStatis.cs

Show notes View FrmBSQDuoBianXingStatis.Designer.cs 100644 → 0

Show notes View FrmBSQDuoBianXingStatis.cs 100644 → 0

Show notes View FrmBSQDuoBianXingStatis.resx 100644 → 0

Ignore Space Show notes View FrmBSQStatis.Designer.cs

Ignore Space Show notes View FrmBSQStatis.cs

Ignore Space Show notes View FrmValveStatistics.cs

Ignore Space Show notes View FrmpipeDeepstatis.cs

Ignore Space Show notes View FrmpipeMaterialGather.cs

Ignore Space Show notes View Frmpipediameterstatis.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

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

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

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

Show line notes below