Commit 92a5a66
committed
Merge branch 'master' of https://github.com/McNeight/SharpZipLib into McNeight-master
# Conflicts:
# .travis.yml
# Build/ICSharpCode.SharpZipLib.nuspec
# GlobalAssemblyInfo.cs
# ICSharpCode.SharpZipLib.Samples/Samples.sln
# ICSharpCode.SharpZipLib.Samples/cs/Cmd_Tar/Tar.cs
# ICSharpCode.SharpZipLib.Samples/cs/CreateZipFile/CreateZipFile.cs
# ICSharpCode.SharpZipLib.Samples/cs/CreateZipFile/CreateZipFile.csproj
# ICSharpCode.SharpZipLib.Samples/cs/FastZip/FastZip.csproj
# ICSharpCode.SharpZipLib.Samples/cs/FastZip/Main.cs
# ICSharpCode.SharpZipLib.Samples/cs/minibzip2/Main.cs
# ICSharpCode.SharpZipLib.Samples/cs/minibzip2/minibzip2.csproj
# ICSharpCode.SharpZipLib.Samples/cs/minigzip/Main.cs
# ICSharpCode.SharpZipLib.Samples/cs/minigzip/minigzip.csproj
# ICSharpCode.SharpZipLib.Samples/cs/sz/sz.csproj
# ICSharpCode.SharpZipLib.Samples/cs/tar/Main.cs
# ICSharpCode.SharpZipLib.Samples/cs/tar/Tar.csproj
# ICSharpCode.SharpZipLib.Samples/cs/tar/tar.cs
# ICSharpCode.SharpZipLib.Samples/cs/unzipfile/unzipfile.csproj
# ICSharpCode.SharpZipLib.Samples/cs/viewzipfile/viewzipfile.csproj
# ICSharpCode.SharpZipLib.Samples/cs/zf/zf.csproj
# ICSharpCode.SharpZipLib.Samples/cs/zipfiletest/zipfiletest.csproj
# ICSharpCode.SharpZipLib.Samples/vb/CreateZipFile/CreateZipFile.vbproj
# ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/Application.xaml
# ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/My Project/Resources.Designer.vb
# ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/My Project/Settings.Designer.vb
# ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/WpfCreateZipFile.vbproj
# ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/WpfCreateZipFileWindow.xaml
# ICSharpCode.SharpZipLib.Samples/vb/WpfCreateZipFile/WpfCreateZipFileWindow.xaml.vb
# ICSharpCode.SharpZipLib.Samples/vb/minibzip2/minibzip2.vbproj
# ICSharpCode.SharpZipLib.Samples/vb/viewzipfile/viewzipfile.vbproj
# ICSharpCode.SharpZipLib.Samples/vb/zipfiletest/zipfiletest.vbproj
# ICSharpCode.SharpZipLib.Tests/ICSharpCode.SharpZipLib.Tests.csproj
# ICSharpCode.SharpZipLib.Tests/Zip/ZipTests.cs
# ICSharpCode.SharpZipLib.Tests/app.config
# ICSharpCode.SharpZipLib.Tests/packages.config
# ICSharpCode.SharpZipLib/Checksum/Adler32.cs
# ICSharpCode.SharpZipLib/Checksum/Crc32.cs
# ICSharpCode.SharpZipLib/Checksum/IChecksum.cs
# ICSharpCode.SharpZipLib/Checksums/BZip2Crc.cs
# ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
# ICSharpCode.SharpZipLib/SharpZipBaseException.cs
# ICSharpCode.SharpZipLib/Tar/TarArchive.cs
# ICSharpCode.SharpZipLib/Tar/TarHeader.cs
# ICSharpCode.SharpZipLib/Tar/TarOutputStream.cs
# ICSharpCode.SharpZipLib/Zip/ZipEntry.cs
# ICSharpCode.SharpZipLib/Zip/ZipExtraData.cs
# ICSharpCode.SharpZipLib/Zip/ZipFile.cs
# ICSharpCode.SharpZipLib/Zip/ZipInputStream.cs
# README.md
# appveyor.yml91 files changed
Lines changed: 2831 additions & 1468 deletions
File tree
- Build
- Documentation
- ICSharpCode.SharpZipLib.Samples
- cs
- Cmd_BZip2
- Cmd_Checksum
- Cmd_GZip
- Cmd_Tar
- Cmd_ZipInfo
- CreateZipFile
- FastZip
- minibzip2
- minigzip
- sz
- unzipfile
- viewzipfile
- zf
- zipfiletest
- vb
- CreateZipFile
- WpfCreateZipFile
- My Project
- minibzip2
- viewzipfile
- zipfiletest
- ICSharpCode.SharpZipLib.Tests
- Checksums
- Checksum
- Zip
- ICSharpCode.SharpZipLib
- BZip2
- Checksums
- Checksum
- Encryption
- GZip
- Zip
- Compression
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | 10 | | |
12 | 11 | | |
13 | 12 | | |
14 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
| 9 | + | |
13 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
14 | 16 | | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
19 | 24 | | |
20 | 25 | | |
21 | | - | |
22 | | - | |
23 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
24 | 35 | | |
25 | 36 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
172 | 172 | | |
173 | 173 | | |
174 | 174 | | |
175 | | - | |
| 175 | + | |
176 | 176 | | |
177 | 177 | | |
178 | 178 | | |
| |||
410 | 410 | | |
411 | 411 | | |
412 | 412 | | |
413 | | - | |
| 413 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
5 | 8 | | |
6 | 9 | | |
7 | 10 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | | - | |
| 46 | + | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
49 | 51 | | |
50 | | - | |
| 52 | + | |
51 | 53 | | |
52 | | - | |
| 54 | + | |
53 | 55 | | |
54 | | - | |
| 56 | + | |
55 | 57 | | |
56 | 58 | | |
57 | 59 | | |
| |||
80 | 82 | | |
81 | 83 | | |
82 | 84 | | |
| 85 | + | |
83 | 86 | | |
| 87 | + | |
84 | 88 | | |
85 | 89 | | |
86 | 90 | | |
| |||
93 | 97 | | |
94 | 98 | | |
95 | 99 | | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | 100 | | |
105 | 101 | | |
106 | 102 | | |
107 | 103 | | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | 104 | | |
113 | 105 | | |
114 | 106 | | |
115 | 107 | | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | 108 | | |
121 | 109 | | |
122 | 110 | | |
| |||
125 | 113 | | |
126 | 114 | | |
127 | 115 | | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
128 | 136 | | |
129 | 137 | | |
130 | 138 | | |
| |||
137 | 145 | | |
138 | 146 | | |
139 | 147 | | |
140 | | - | |
141 | | - | |
142 | 148 | | |
143 | | - | |
144 | 149 | | |
145 | | - | |
146 | 150 | | |
147 | 151 | | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
148 | 157 | | |
149 | 158 | | |
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
0 commit comments