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.

21 lines
1.5 KiB
Plaintext

2 years ago
XGL
winexe
C#
.cs
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
E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\
2 years ago
XGL
none
false
DEBUG;TRACE
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
E:\workspace\LanJu\client\shangjian\XGL\App.xaml
2 years ago
54-2004655723
2 years ago
3-297253631
2 years ago
67-243248012
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
511606894072
2 years ago
CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml;
2 years ago
True
2 years ago