michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source 
Conflicts:
	MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
	MediaBrowser.Model/IO/IZipClient.cs
This commit is contained in:
Luke Pulverenti 2014-12-28 23:13:03 -05:00
commit 55a726cdef
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
View File

@ -63,7 +63,7 @@ namespace MediaBrowser.Common.Implementations.Archiving
reader.WriteAllToDirectory(targetPath, options); reader.WriteAllToDirectory(targetPath, options);
} }
} }
/// <summary> /// <summary>
/// Extracts all from7z. /// Extracts all from7z.
/// </summary> /// </summary>

2
MediaBrowser.Model/IO/IZipClient.cs
View File

@ -30,7 +30,7 @@ namespace MediaBrowser.Model.IO
/// <param name="targetPath">The target path.</param> /// <param name="targetPath">The target path.</param>
/// <param name="overwriteExistingFiles">if set to <c>true</c> [overwrite existing files].</param> /// <param name="overwriteExistingFiles">if set to <c>true</c> [overwrite existing files].</param>
void ExtractAllFromZip(Stream source, string targetPath, bool overwriteExistingFiles); void ExtractAllFromZip(Stream source, string targetPath, bool overwriteExistingFiles);
/// <summary> /// <summary>
/// Extracts all from7z. /// Extracts all from7z.
/// </summary> /// </summary>