Adam Hathcock
|
ff22cd774e
|
Merge branch 'master' into dnx
Conflicts:
NuGet/sharpcompress.nuspec
SharpCompress/Common/Zip/WinzipAesCryptoStream.Portable.cs
SharpCompress/Common/Zip/WinzipAesEncryptionData.Portable.cs
SharpCompress/Crypto/PBKDF2.cs
SharpCompress/SharpCompress.Portable.csproj
SharpCompress/SharpCompress.PortableTest.csproj
SharpCompress/SharpCompress.Unsigned.csproj
SharpCompress/SharpCompress.WindowsStore.csproj
SharpCompress/SharpCompress.csproj
src/SharpCompress/Archive/ArchiveFactory.cs
src/SharpCompress/Archive/Rar/FileInfoRarFilePart.cs
src/SharpCompress/Archive/Rar/RarArchive.cs
src/SharpCompress/Archive/Rar/RarArchiveEntry.cs
src/SharpCompress/Archive/SevenZip/SevenZipArchiveEntry.cs
src/SharpCompress/Common/GZip/GZipFilePart.cs
src/SharpCompress/Common/GZip/GZipVolume.cs
src/SharpCompress/Common/Rar/Headers/MarkHeader.cs
src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs
src/SharpCompress/Common/SevenZip/ArchiveReader.cs
src/SharpCompress/Common/SevenZip/DataReader.cs
src/SharpCompress/Common/Tar/Headers/TarHeader.cs
src/SharpCompress/Common/Zip/Headers/ZipFileEntry.cs
src/SharpCompress/Common/Zip/WinzipAesCryptoStream.cs
src/SharpCompress/Common/Zip/WinzipAesEncryptionData.cs
src/SharpCompress/Common/Zip/ZipFilePart.cs
src/SharpCompress/Compressor/Deflate/GZipStream.cs
src/SharpCompress/Compressor/Deflate/Inflate.cs
src/SharpCompress/Compressor/Deflate/ZlibBaseStream.cs
src/SharpCompress/Compressor/LZMA/Bcj2DecoderStream.cs
src/SharpCompress/Compressor/LZMA/LzmaStream.cs
src/SharpCompress/Compressor/PPMd/H/FreqData.cs
src/SharpCompress/Compressor/PPMd/H/PPMContext.cs
src/SharpCompress/Compressor/PPMd/H/RarMemBlock.cs
src/SharpCompress/Compressor/PPMd/H/RarNode.cs
src/SharpCompress/Compressor/PPMd/H/State.cs
src/SharpCompress/Compressor/PPMd/PpmdProperties.cs
src/SharpCompress/Compressor/Rar/VM/RarVM.cs
src/SharpCompress/EnumExtensions.cs
src/SharpCompress/IO/MarkingBinaryReader.cs
src/SharpCompress/Reader/ReaderFactory.cs
src/SharpCompress/Utility.cs
src/SharpCompress/Writer/IWriter.Extensions.cs
src/SharpCompress/Writer/Zip/ZipCentralDirectoryEntry.cs
src/SharpCompress/Writer/Zip/ZipWriter.cs
test/SharpCompress.Test/Tar/TarArchiveTests.cs
test/SharpCompress.Test/Tar/TarReaderTests.cs
|
2016-02-13 09:24:44 +00:00 |
|
