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.

95 lines
6.8 KiB
Plaintext

2 years ago

2 years ago
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
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormBoard.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormChargingBoard.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormLocator.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormOutBoxBoard.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormShowSelect.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\Main.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\ordertj.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\orderzfzy.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\orderzy.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\product_order.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\product_ordertj.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\product_orderzfzy.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\product_orderzy.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCArea.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCBoard.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCCar.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCCarL.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCLMix.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCMix.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCMixR.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCPermissionList.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCPostionList.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCProgressBar.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCRoleList.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCRProgressBar.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCStorage.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCStorageNew.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCStorageNewx.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCTakeOff.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCUserList.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Complete.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_DeviceItems.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Flow.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Index.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_InOut.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Material.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_NowUser.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Paused.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Prepare.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_User.xaml;;
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_UserRecord.xaml;;
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
=======
2 years ago
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormChargingBoard.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormLocator.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormOutBoxBoard.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormShowSelect.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\Main.xaml;;
2 years ago
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Tools\ModuleUC.xaml;;
2 years ago
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\ordertj.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\orderzfzy.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\orderzy.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_order.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_ordertj.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_orderzfzy.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_orderzy.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCArea.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCBoard.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCCar.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCCarL.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCLMix.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCMix.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCMixR.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCPermissionList.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCPostionList.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCProgressBar.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCRoleList.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCRProgressBar.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorage.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorageNew.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorageNewx.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCTakeOff.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCUserList.xaml;;
2 years ago
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\CheckUserWin.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\DryingRoomUC.xaml;;
2 years ago
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Complete.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_DeviceItems.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Flow.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Index.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_InOut.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Material.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_NowUser.xaml;;
2 years ago
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Operator.xaml;;
2 years ago
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Paused.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Prepare.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_User.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_UserRecord.xaml;;
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
2 years ago