diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-28 23:13:03 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-28 23:13:03 -0500 |
| commit | 55a726cdef5f7d4185983f2d6293db024cf415d9 (patch) | |
| tree | 7949bd78735d913a65109b79104378caaeea207c | |
| parent | 726cf9697aba40f26223789138fe0858ebb374bc (diff) | |
| parent | c9bf564c4523798fc6b2250fba41daed4f89939d (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
MediaBrowser.Model/IO/IZipClient.cs
| -rw-r--r-- | MediaBrowser.Common.Implementations/Archiving/ZipClient.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/IO/IZipClient.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Common.Implementations/Archiving/ZipClient.cs b/MediaBrowser.Common.Implementations/Archiving/ZipClient.cs index c32134d4f..3d759ca54 100644 --- a/MediaBrowser.Common.Implementations/Archiving/ZipClient.cs +++ b/MediaBrowser.Common.Implementations/Archiving/ZipClient.cs @@ -63,7 +63,7 @@ namespace MediaBrowser.Common.Implementations.Archiving reader.WriteAllToDirectory(targetPath, options); } } - + /// <summary> /// Extracts all from7z. /// </summary> diff --git a/MediaBrowser.Model/IO/IZipClient.cs b/MediaBrowser.Model/IO/IZipClient.cs index 13b31c201..ac57d58a6 100644 --- a/MediaBrowser.Model/IO/IZipClient.cs +++ b/MediaBrowser.Model/IO/IZipClient.cs @@ -30,7 +30,7 @@ namespace MediaBrowser.Model.IO /// <param name="targetPath">The target path.</param> /// <param name="overwriteExistingFiles">if set to <c>true</c> [overwrite existing files].</param> void ExtractAllFromZip(Stream source, string targetPath, bool overwriteExistingFiles); - + /// <summary> /// Extracts all from7z. /// </summary> |