Browse code Merge branch 'master' of http://192.168.0.203:8080/gitbucket/git/root/GHFX_REFACTOR Conflicts: Cyberpipe.csproj Cyberpipe.suo MainFrm.resx bin/x86/Debug/Cyberpipe.exe bin/x86/Debug/Cyberpipe.pdb obj/x64/Debug/Cyberpipe.csproj.FileListAbsolute.txt obj/x64/Debug/Cyberpipe.exe obj/x64/Debug/Cyberpipe.pdb obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache develop fuzhou fuzhouyq ganzhou master rkdw shouguang 1.1.0.0 1.0.0.0 1.0.0 0.1.0

commit 56315f2fd75cdd65a45dbc89aa090dd4ea2986bd 2 parents 8af102b + c18bae2 zhangfan authored on 1 Nov 2016

Showing 44 changed files

• ClassGSOTool.cs
• ClassSearchAnalysis.cs
• Cyberpipe.csproj
• DoublePanelAnalysis.cs
• FeatureStatisticsService.cs
• FeaturesClassfyResult.cs
• FrmAccessoriesgather.cs
• FrmAllPipelineStatis.cs
• FrmBasicQuery.cs
• FrmCodingQuery.cs
• FrmDiameterQuery.Designer.cs
• FrmDiameterQuery.cs
• FrmFittingQuery.cs
• FrmKeywordQuery.cs
• FrmMaterialSel.Designer.cs
• FrmMaterialSel.cs
• FrmMaterialSel.resx
• FrmQuerySQL.cs
• FrmSetLatLonPos.cs
• FrmValveStatistics.cs
• FrmpipeDeepstatis.cs
• FrmpipeDiametergather.cs
• FrmpipeMaterialGather.cs
• Frmpipediameterstatis.cs
• MainFrm.cs
• MainFrm.designer.cs
• MainFrm.resx
• bin/x86/Debug/Config.xml
• bin/x86/Debug/glVersion.txt
• bin/x86/Debug/log.txt
• bin/x86/Debug/npLocaSpacePlugin.dll
• bin/x86/Debug/office.dll
• bin/x86/Debug/office.xml
• bin/x86/Debug/oldDLL/npLocaSpacePlugin.dll
• obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
• obj/x64/Debug/Cyberpipe.FrmLogin.resources
• obj/x64/Debug/Cyberpipe.HFS_Forms.Frm_HFSinout.resources
• obj/x64/Debug/Cyberpipe.MainFrm.resources
• obj/x64/Debug/Cyberpipe.PATM_Forms.F_PATMInout.resources
• obj/x64/Debug/Cyberpipe.Properties.Resources.resources
• obj/x64/Debug/Cyberpipe.csproj.ResolveComReference.cache
• obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache
• obj/x64/Debug/GenerateResource.read.1.tlog
• obj/x64/Debug/GenerateResource.write.1.tlog

Ignore Space Show notes View ClassGSOTool.cs 0 → 100644

Ignore Space Show notes View ClassSearchAnalysis.cs 0 → 100644

Ignore Space Show notes View Cyberpipe.csproj

Ignore Space Show notes View DoublePanelAnalysis.cs

Ignore Space Show notes View FeatureStatisticsService.cs 0 → 100644

Ignore Space Show notes View FeaturesClassfyResult.cs 0 → 100644

Ignore Space Show notes View FrmAccessoriesgather.cs

Ignore Space Show notes View FrmAllPipelineStatis.cs

Ignore Space Show notes View FrmBasicQuery.cs

Ignore Space Show notes View FrmCodingQuery.cs

Ignore Space Show notes View FrmDiameterQuery.Designer.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.Designer.cs

Ignore Space Show notes View FrmMaterialSel.cs

Ignore Space Show notes View FrmMaterialSel.resx

Ignore Space Show notes View FrmQuerySQL.cs

Ignore Space Show notes View FrmSetLatLonPos.cs

Ignore Space Show notes View FrmValveStatistics.cs

Ignore Space Show notes View FrmpipeDeepstatis.cs

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

Ignore Space Show notes View MainFrm.resx

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

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

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

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

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

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

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

Ignore Space Show notes View obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Not supported

Ignore Space Show notes View obj/x64/Debug/Cyberpipe.FrmLogin.resources
Not supported

Ignore Space Show notes View obj/x64/Debug/Cyberpipe.HFS_Forms.Frm_HFSinout.resources
Not supported

Ignore Space Show notes View obj/x64/Debug/Cyberpipe.MainFrm.resources
Not supported

Ignore Space Show notes View obj/x64/Debug/Cyberpipe.PATM_Forms.F_PATMInout.resources
Not supported

Ignore Space Show notes View obj/x64/Debug/Cyberpipe.Properties.Resources.resources
Not supported

Ignore Space Show notes View obj/x64/Debug/Cyberpipe.csproj.ResolveComReference.cache
Not supported

Ignore Space Show notes View obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Not supported

Ignore Space Show notes View obj/x64/Debug/GenerateResource.read.1.tlog
Not supported

Ignore Space Show notes View obj/x64/Debug/GenerateResource.write.1.tlog
Not supported

Show line notes below