Yangwl
/
lanju-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '4041880366'
${ noResults }
lanju-client/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompi...

6 lines
152 B
Plaintext
Raw Normal View History Unescape Escape

Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client # Conflicts: # shangjian/.vs/BL/v17/.suo # shangjian/CentralControl/bin/Debug/CentralControl.exe # shangjian/CentralControl/bin/Debug/CentralControl.pdb # shangjian/CentralControl/bin/Debug/CommonFunc.dll # shangjian/CentralControl/bin/Debug/CommonFunc.pdb # shangjian/CentralControl/bin/Debug/XGL.Data.dll # shangjian/CentralControl/bin/Debug/XGL.Data.pdb # shangjian/CentralControl/bin/Debug/XGL.Models.dll # shangjian/CentralControl/bin/Debug/XGL.Models.pdb # shangjian/CentralControl/bin/Debug/XGL.Thrift.dll # shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb # shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache # shangjian/CentralControl/obj/Debug/CentralControl.exe # shangjian/CentralControl/obj/Debug/CentralControl.pdb # shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll # shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb # shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll # shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb # shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache # shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll # shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb # shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache # shangjian/LanJuLib/bin/Debug/CommonFunc.dll # shangjian/LanJuLib/bin/Debug/CommonFunc.pdb # shangjian/LanJuLib/bin/Debug/XGL.Models.dll # shangjian/LanJuLib/bin/Debug/XGL.Models.pdb # shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache # shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll # shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb # shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll # shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb # shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll # shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb # shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb # shangjian/XGL.Model/bin/Debug/XGL.Models.dll # shangjian/XGL.Model/bin/Debug/XGL.Models.pdb # shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache # shangjian/XGL.Model/obj/Debug/XGL.Models.dll # shangjian/XGL.Model/obj/Debug/XGL.Models.pdb # shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll # shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb # shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll # shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb # shangjian/XGL/Views/LanJu_Prepare.xaml.cs # shangjian/XGL/bin/x86/Debug/CentralControl.exe # shangjian/XGL/bin/x86/Debug/CentralControl.pdb # shangjian/XGL/bin/x86/Debug/CommonFunc.dll # shangjian/XGL/bin/x86/Debug/CommonFunc.pdb # shangjian/XGL/bin/x86/Debug/XGL.Data.dll # shangjian/XGL/bin/x86/Debug/XGL.Data.pdb # shangjian/XGL/bin/x86/Debug/XGL.Models.dll # shangjian/XGL/bin/x86/Debug/XGL.Models.pdb # shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll # shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb # shangjian/XGL/bin/x86/Debug/XGL.exe # shangjian/XGL/bin/x86/Debug/XGL.pdb # shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache # shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache # shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt # shangjian/XGL/obj/x86/Debug/XGL.exe # shangjian/XGL/obj/x86/Debug/XGL.g.resources # shangjian/XGL/obj/x86/Debug/XGL.pdb # shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache # shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
2 years ago
<<<<<<< HEAD
合并
2 years ago
447124d86454b5028e0096d5af8102cbe476aa0c
Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client # Conflicts: # shangjian/.vs/BL/v17/.suo # shangjian/CentralControl/bin/Debug/CentralControl.exe # shangjian/CentralControl/bin/Debug/CentralControl.pdb # shangjian/CentralControl/bin/Debug/CommonFunc.dll # shangjian/CentralControl/bin/Debug/CommonFunc.pdb # shangjian/CentralControl/bin/Debug/XGL.Data.dll # shangjian/CentralControl/bin/Debug/XGL.Data.pdb # shangjian/CentralControl/bin/Debug/XGL.Models.dll # shangjian/CentralControl/bin/Debug/XGL.Models.pdb # shangjian/CentralControl/bin/Debug/XGL.Thrift.dll # shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb # shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache # shangjian/CentralControl/obj/Debug/CentralControl.exe # shangjian/CentralControl/obj/Debug/CentralControl.pdb # shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll # shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb # shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll # shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb # shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache # shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll # shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb # shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache # shangjian/LanJuLib/bin/Debug/CommonFunc.dll # shangjian/LanJuLib/bin/Debug/CommonFunc.pdb # shangjian/LanJuLib/bin/Debug/XGL.Models.dll # shangjian/LanJuLib/bin/Debug/XGL.Models.pdb # shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache # shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll # shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb # shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll # shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb # shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll # shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb # shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb # shangjian/XGL.Model/bin/Debug/XGL.Models.dll # shangjian/XGL.Model/bin/Debug/XGL.Models.pdb # shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache # shangjian/XGL.Model/obj/Debug/XGL.Models.dll # shangjian/XGL.Model/obj/Debug/XGL.Models.pdb # shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll # shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb # shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll # shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb # shangjian/XGL/Views/LanJu_Prepare.xaml.cs # shangjian/XGL/bin/x86/Debug/CentralControl.exe # shangjian/XGL/bin/x86/Debug/CentralControl.pdb # shangjian/XGL/bin/x86/Debug/CommonFunc.dll # shangjian/XGL/bin/x86/Debug/CommonFunc.pdb # shangjian/XGL/bin/x86/Debug/XGL.Data.dll # shangjian/XGL/bin/x86/Debug/XGL.Data.pdb # shangjian/XGL/bin/x86/Debug/XGL.Models.dll # shangjian/XGL/bin/x86/Debug/XGL.Models.pdb # shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll # shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb # shangjian/XGL/bin/x86/Debug/XGL.exe # shangjian/XGL/bin/x86/Debug/XGL.pdb # shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache # shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache # shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt # shangjian/XGL/obj/x86/Debug/XGL.exe # shangjian/XGL/obj/x86/Debug/XGL.g.resources # shangjian/XGL/obj/x86/Debug/XGL.pdb # shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache # shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
2 years ago
=======
3
2 years ago
15e0079c678473a5e3606350c39806472a1461a2
Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client # Conflicts: # shangjian/.vs/BL/v17/.suo # shangjian/CentralControl/bin/Debug/CentralControl.exe # shangjian/CentralControl/bin/Debug/CentralControl.pdb # shangjian/CentralControl/bin/Debug/CommonFunc.dll # shangjian/CentralControl/bin/Debug/CommonFunc.pdb # shangjian/CentralControl/bin/Debug/XGL.Data.dll # shangjian/CentralControl/bin/Debug/XGL.Data.pdb # shangjian/CentralControl/bin/Debug/XGL.Models.dll # shangjian/CentralControl/bin/Debug/XGL.Models.pdb # shangjian/CentralControl/bin/Debug/XGL.Thrift.dll # shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb # shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache # shangjian/CentralControl/obj/Debug/CentralControl.exe # shangjian/CentralControl/obj/Debug/CentralControl.pdb # shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll # shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb # shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll # shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb # shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache # shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll # shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb # shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache # shangjian/LanJuLib/bin/Debug/CommonFunc.dll # shangjian/LanJuLib/bin/Debug/CommonFunc.pdb # shangjian/LanJuLib/bin/Debug/XGL.Models.dll # shangjian/LanJuLib/bin/Debug/XGL.Models.pdb # shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache # shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll # shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb # shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll # shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb # shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll # shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb # shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll # shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb # shangjian/XGL.Model/bin/Debug/XGL.Models.dll # shangjian/XGL.Model/bin/Debug/XGL.Models.pdb # shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache # shangjian/XGL.Model/obj/Debug/XGL.Models.dll # shangjian/XGL.Model/obj/Debug/XGL.Models.pdb # shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll # shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb # shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll # shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb # shangjian/XGL/Views/LanJu_Prepare.xaml.cs # shangjian/XGL/bin/x86/Debug/CentralControl.exe # shangjian/XGL/bin/x86/Debug/CentralControl.pdb # shangjian/XGL/bin/x86/Debug/CommonFunc.dll # shangjian/XGL/bin/x86/Debug/CommonFunc.pdb # shangjian/XGL/bin/x86/Debug/XGL.Data.dll # shangjian/XGL/bin/x86/Debug/XGL.Data.pdb # shangjian/XGL/bin/x86/Debug/XGL.Models.dll # shangjian/XGL/bin/x86/Debug/XGL.Models.pdb # shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll # shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb # shangjian/XGL/bin/x86/Debug/XGL.exe # shangjian/XGL/bin/x86/Debug/XGL.pdb # shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache # shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache # shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt # shangjian/XGL/obj/x86/Debug/XGL.exe # shangjian/XGL/obj/x86/Debug/XGL.g.resources # shangjian/XGL/obj/x86/Debug/XGL.pdb # shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache # shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
2 years ago
>>>>>>> babf7ea9e37642c626439584d080cf06049abc5f