Merge branch 'master' into dnx

Conflicts:
	src/SharpCompress/Archive/Rar/RarArchive.cs
This commit is contained in:
Adam Hathcock
2016-01-03 11:19:04 +00:00
2 changed files with 7 additions and 3 deletions

View File

@@ -64,7 +64,7 @@ namespace SharpCompress.Archive.Rar
{
var stream = Volumes.First().Stream;
stream.Position = 0;
return RarReader.Open(stream);
return RarReader.Open(stream, Password);
}
public override bool IsSolid