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
|
zhaoaomin
zhaojian