diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-20 13:34:05 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-20 13:34:05 -0400 |
| commit | 4492dcc5922f4ead968504617b729e102db26c54 (patch) | |
| tree | 7f8afc4a40479f4b4c313ffc9d1004a426c1b004 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | 25c37e40ad11006af1127355bd05ae1b16a5f7b6 (diff) | |
update merge
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 6d45022da..4fcc71f97 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -879,4 +879,4 @@ namespace MediaBrowser.MediaEncoding.Encoder } } } -}
\ No newline at end of file +} |