xhkjedu
/
xhwkclient
Segui 8
Vota 0
Forka 0
Codice Problemi 0 Pull Requests 0 Rilasci 3 Wiki Attività
Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/master' into zyyNew 

# Conflicts:
#	.gitignore
tags/录制修改前
耀 3 anni fa
parent
6104afd610 e580de9e2a
commit
cbe0a18329
1 ha cambiato i file con 93 aggiunte e 39 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 93
    39
      .gitignore

+ 93
- 39
.gitignore Vedi File 

@@ -23,54 +23,110 @@ Common/bin/Debug/Common.pdb~origin_zxy
23 23 
 Common/bin/Debug/ICSharpCode.SharpZipLib.dll
24 24 
 Common/bin/Debug/log4net.config
25 25 
 Common/bin/Debug/log4net.dll
26 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser.profile
27 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser ps.profile
28 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser limited2 blue gdi.profile
29 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser limited.profile
30 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser limited ps.profile
31 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser limited gdi.profile
32 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser gdi.profile
33 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C9650.profile
34 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C9600.profile
35 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C8800.profile
36 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C710.profile
37 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C5950.profile
38 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C5900.profile
39 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C5400.profile
40 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/OKI C9650 Forms.profile
41 
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/OKI C9600.profile
42 
+XHWK.WKTool/bin/Debug/PrintTool/Ghostscript/gs8.71/lib/stc1520h.upp
43 
+XHWK.WKTool/bin/Debug/PrintTool/Ghostscript/gs8.71/lib/landscap.ps
44 
+XHWK.WKTool/bin/Debug/PrintTool/Ghostscript/gs8.71/lib/gs_btokn.ps
45 
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDScanConverter.dll
46 
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPublishImageGenerator.dll
47 
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPatternGenerator.dll
48 
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPatternGenerator.bin
49 
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPGHelper.dll
50 
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPDFFileGenerator.dll
51 
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OID PG.ini
52 
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/AppVersionType.ini
53 
+XHWK.WKTool/bin/Debug/O2S.Components.PDFRender4NET.dll
54 
+XHWK.WKTool/bin/Debug/Newtonsoft.Json.xml
55 
+XHWK.WKTool/bin/Debug/Newtonsoft.Json.dll
56 
+XHWK.WKTool/bin/Debug/Microsoft.mshtml.dll
57 
+XHWK.WKTool/bin/Debug/Log/PrintLog/20210713.log
58 
+XHWK.WKTool/bin/Debug/LatticeXML/print_license.xml
59 
+XHWK.WKTool/bin/Debug/LatticeXML/S0_O000_B0000_P000-255.tmx
60 
+XHWK.WKTool/bin/Debug/ICSharpCode.SharpZipLib.dll
61 
+XHWK.WKTool/bin/Debug/DrawToolsLib.dll
62 
+XHWK.WKTool/bin/Debug/DocumentTools.dll
63 
+XHWK.WKTool/bin/Debug/Common.pdb
64 
+XHWK.WKTool/bin/Debug/Common.dll
65 
+XHWK.WKTool/bin/Debug/CheckPoint.dll
66 
+XHWK.WKTool/bin/Debug/BouncyCastle.Crypto.dll
67 
+XHWK.WKTool/bin/Debug/AxInterop.AcroPDFLib.dll
68 
+XHWK.WKTool/bin/Debug/Aspose.Words.xml
69 
+XHWK.WKTool/bin/Debug/Aspose.Words.dll
70 
+XHWK.WKTool/bin/Debug/Aspose.Slides.dll
71 
+XHWK.WKTool/bin/Debug/Aspose.PDF.xml
72 
+XHWK.WKTool/bin/Debug/Aspose.PDF.dll
73 
+XHWK.WKTool/bin/Debug/AForge.xml
74 
+XHWK.WKTool/bin/Debug/AForge.dll
75 
+XHWK.WKTool/bin/Debug/AForge.Video.xml
76 
+XHWK.WKTool/bin/Debug/AForge.Video.dll
77 
+XHWK.WKTool/bin/Debug/AForge.Video.DirectShow.xml
78 
+XHWK.WKTool/bin/Debug/AForge.Video.DirectShow.dll
79 
+XHWK.WKTool/bin/Debug/AForge.Math.xml
80 
+XHWK.WKTool/bin/Debug/AForge.Math.dll
81 
+XHWK.WKTool/bin/Debug/AForge.Imaging.xml
82 
+XHWK.WKTool/bin/Debug/AForge.Imaging.dll
83 
+XHWK.WKTool/bin/Debug/AForge.Controls.xml
84 
+XHWK.WKTool/bin/Debug/AForge.Controls.dll
85 
+XHWK.Model/obj/Debug/XHWK.Model.pdb
86 
+XHWK.Model/obj/Debug/XHWK.Model.dll
87 
+XHWK.Model/obj/Debug/XHWK.Model.csproj.FileListAbsolute.txt
88 
+XHWK.Model/obj/Debug/XHWK.Model.csproj.CoreCompileInputs.cache
89 
+XHWK.Model/obj/Debug/XHWK.Model.csproj.CopyComplete
90 
+XHWK.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
91 
+XHWK.Model/obj/Debug/.NETFramework,Version=v4.5.2.AssemblyAttributes.cs
92 
+XHWK.Model/bin/Debug/XHWK.Model.pdb
93 
+XHWK.Model/bin/Debug/XHWK.Model.dll
94 
+XHWK.Model/bin/Debug/NStandard.dll
95 
+XHWK.Model/bin/Debug/Ink.dll
96 
+Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
97 
+Common/obj/Debug/Common.pdb
98 
+Common/obj/Debug/Common.dll
99 
+Common/obj/Debug/Common.csproj.FileListAbsolute.txt
100 
+Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
101 
+Common/obj/Debug/Common.csproj.CopyComplete
102 
+Common/obj/Debug/Common.csproj.AssemblyReference.cache
103 
+Common/obj/Debug/.NETFramework,Version=v4.5.2.AssemblyAttributes.cs
26 104 
 Common/bin/Debug/log4net.xml
27 
-Common/bin/Debug/Newtonsoft.Json.dll
105 
+Common/bin/Debug/log4net.dll
106 
+Common/bin/Debug/log4net.config
107 
+Common/bin/Debug/XHWK.Model.pdb
108 
+Common/bin/Debug/XHWK.Model.dll
109 
+Common/bin/Debug/VisioForge.Types.dll
110 
+Common/bin/Debug/VisioForge.Tools.dll
111 
+Common/bin/Debug/VisioForge.Shared.dll
112 
+Common/bin/Debug/VisioForge.MediaFramework.dll
113 
+Common/bin/Debug/VisioForge.Controls.dll
114 
+Common/bin/Debug/VisioForge.Controls.UI.dll
115 
+Common/bin/Debug/VisioForge.Controls.UI.Dialogs.dll
116 
+Common/bin/Debug/System.Data.SQLite.dll
117 
+Common/bin/Debug/O2S.Components.PDFRender4NET.dll
28 118 
 Common/bin/Debug/Newtonsoft.Json.xml
119 
+Common/bin/Debug/Newtonsoft.Json.dll
29 120 
 Common/bin/Debug/NPOI.dll
121 
+Common/bin/Debug/NPOI.OpenXmlFormats.dll
30 122 
 Common/bin/Debug/NPOI.OOXML.dll
31 123 
 Common/bin/Debug/NPOI.OpenXml4Net.dll
32 
-Common/bin/Debug/NPOI.OpenXmlFormats.dll
33 
-Common/bin/Debug/O2S.Components.PDFRender4NET.dll
34 
-Common/bin/Debug/System.Data.SQLite.dll
35 
-Common/bin/Debug/VisioForge.Controls.dll
36 
-Common/bin/Debug/VisioForge.Controls.UI.Dialogs.dll
37 
-Common/bin/Debug/VisioForge.Controls.UI.dll
38 
-Common/bin/Debug/VisioForge.MediaFramework.dll
39 
-Common/bin/Debug/VisioForge.Shared.dll
40 
-Common/bin/Debug/VisioForge.Tools.dll
41 
-Common/bin/Debug/VisioForge.Types.dll
42 
-Common/bin/Debug/XHWK.Model.dll
43 
-Common/bin/Debug/XHWK.Model.pdb
44 
-XHWK.WKTool/bin/Debug/AForge.Controls.dll
45 
-XHWK.WKTool/bin/Debug/AForge.Controls.xml
46 
-XHWK.WKTool/bin/Debug/AForge.dll
47 
-XHWK.WKTool/bin/Debug/AForge.Imaging.dll
48 
-XHWK.WKTool/bin/Debug/AForge.Imaging.xml
49 
-XHWK.WKTool/bin/Debug/AForge.Math.dll
50 
-XHWK.WKTool/bin/Debug/AForge.Math.xml
51 
-XHWK.WKTool/bin/Debug/AForge.Video.DirectShow.dll
52 
-XHWK.WKTool/bin/Debug/AForge.Video.DirectShow.xml
53 
-XHWK.WKTool/bin/Debug/AForge.Video.dll
54 
-XHWK.WKTool/bin/Debug/AForge.Video.xml
55 
-XHWK.WKTool/bin/Debug/AForge.xml
56 
-XHWK.WKTool/bin/Debug/Aspose.PDF.dll
57 
-XHWK.WKTool/bin/Debug/Aspose.PDF.xml
58 
-XHWK.WKTool/bin/Debug/Aspose.Slides.dll
59 
-XHWK.WKTool/bin/Debug/Aspose.Words.dll
60 
-XHWK.WKTool/bin/Debug/Aspose.Words.xml
61 
-XHWK.WKTool/bin/Debug/CheckPoint.dll
62 
-XHWK.WKTool/bin/Debug/Common.dll
63 
-XHWK.WKTool/bin/Debug/Common.pdb
64 124 
 XHWK.WKTool/bin/Debug/ffmpegx32.zip
65 125 
 XHWK.WKTool/bin/Debug/ffmpegx64.zip
66 
-XHWK.WKTool/bin/Debug/ICSharpCode.SharpZipLib.dll
67 126 
 XHWK.WKTool/bin/Debug/itextsharp.xml
68 127 
 XHWK.WKTool/bin/Debug/log4net.config
69 128 
 XHWK.WKTool/bin/Debug/log4net.dll
70 129 
 XHWK.WKTool/bin/Debug/log4net.xml
71 
-XHWK.WKTool/bin/Debug/Microsoft.mshtml.dll
72 
-XHWK.WKTool/bin/Debug/Newtonsoft.Json.dll
73 
-XHWK.WKTool/bin/Debug/Newtonsoft.Json.xml
74 130 
 XHWK.WKTool/bin/Debug/Spire.License.xml
75 131 
 XHWK.WKTool/bin/Debug/TmatrixLibrary_OID4.dll
76 132 
 XHWK.WKTool/bin/Debug/WpfAnimatedGif.pdb
 
@@ -81,7 +137,5 @@ XHWK.WKTool/bin/Debug/星火微课.exe
81 137 
 XHWK.WKTool/bin/Debug/星火微课.exe.config
82 138 
 XHWK.WKTool/bin/Debug/星火微课.pdb
83 139 
 XHWK.WKTool/bin/Debug/星火微课点阵码打印及印刷指导手册.docx
84 
-XHWK.WKTool/bin/Debug/LatticeXML/print_license.xml
85 
-XHWK.WKTool/bin/Debug/LatticeXML/S0_O000_B0000_P000-255.tmx
86 140 
 XHWK.WKTool/bin/Debug/Resources/AudioFrequency.mp3
87 141 
 XHWK.WKTool/bin/Debug/SSCR/Setup Screen Capturer Recorder v0.12.10.exe

Write Preview
Loading…
Annulla
Salva