Browse code Merge branch 'master' of http://192.168.0.203:8080/gitbucket/git/root/GHFX_REFACTOR Conflicts: Cyberpipe.suo bin/x86/Debug/Config.xml develop fuzhou fuzhouyq ganzhou master rkdw shouguang 1.1.0.0 1.0.0.0 1.0.0 0.1.0
commit cab3fc61339697bcca1eb3572d26ac780d858a72 2 parents add1488 + 8688cc6 xiaowei authored on 1 Nov 2016

Showing 26 changed files

• BaseParam.cs
• Cyberpipe.csproj
• Cyberpipe.suo
• EnumBuilderMode.cs
• LineBuilder.cs
• MainFrm.designer.cs
• ModelBuilder.cs
• PointBuilder.cs
• bin/x86/Debug/Config.xml
• bin/x86/Debug/Cyberpipe.exe
• bin/x86/Debug/Cyberpipe.pdb
• bin/x86/Debug/databaseConfig.xml
• bin/x86/Debug/glVersion.txt
• 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.FileListAbsolute.txt
• obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache
• obj/x64/Debug/Cyberpipe.csproj.ResolveComReference.cache
• obj/x64/Debug/Cyberpipe.csprojResolveAssemblyReference.cache
• obj/x64/Debug/Cyberpipe.exe
• obj/x64/Debug/Cyberpipe.pdb
• obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache
• obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Ignore Space Show notes View BaseParam.cs 0 → 100644

Ignore Space Show notes View Cyberpipe.csproj

Ignore Space Show notes View Cyberpipe.suo
Not supported

Ignore Space Show notes View EnumBuilderMode.cs 0 → 100644

Ignore Space Show notes View LineBuilder.cs 0 → 100644

Ignore Space Show notes View MainFrm.designer.cs

Ignore Space Show notes View ModelBuilder.cs 0 → 100644

Ignore Space Show notes View PointBuilder.cs 0 → 100644

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

Ignore Space Show notes View bin/x86/Debug/Cyberpipe.exe
Not supported

Ignore Space Show notes View bin/x86/Debug/Cyberpipe.pdb
Not supported

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

Ignore Space Show notes View bin/x86/Debug/glVersion.txt
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.FileListAbsolute.txt

Ignore Space Show notes View obj/x64/Debug/Cyberpipe.csproj.GenerateResource.Cache
Not supported

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

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

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

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

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

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

Show line notes below