diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-12-18 00:47:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 00:47:58 -0500 |
| commit | e78bbbd6f115f9c0ea610352afc8e7029edcd1b2 (patch) | |
| tree | cdc6ea0ffdd5e8066dc81bbc39480436d58dacd7 | |
| parent | 38b26acd87ac1e1fee6da2e8e79b156315bed8db (diff) | |
| parent | d7ad1331f17a0985cf0a83d1a155caef68a733d0 (diff) | |
Merge pull request #2352 from MediaBrowser/master
merge from master
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index aac4ed4d1..6d68831ff 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -1244,4 +1244,4 @@ namespace MediaBrowser.Model.Dlna return true; } } -} +}
\ No newline at end of file diff --git a/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs index 158e87899..3346b43d3 100644 --- a/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs @@ -133,4 +133,4 @@ namespace MediaBrowser.XbmcMetadata.Savers { } } -} +}
\ No newline at end of file diff --git a/SharedVersion.cs b/SharedVersion.cs index ded2038b0..0561738e2 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.1.*")] -//[assembly: AssemblyVersion("3.0.6060")] +//[assembly: AssemblyVersion("3.1.*")] +[assembly: AssemblyVersion("3.1.259")] |