diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-04-04 22:27:27 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-04-04 22:27:27 -0700 |
| commit | ddf464720e879ff2fa75a843bbb362651c5ef2a7 (patch) | |
| tree | f435395fec9448d44aba16b8ee690e86252db8d2 /MediaBrowser.Model | |
| parent | be710018c5718c6b16022bb6b29b1e3f8b350b62 (diff) | |
| parent | 2d7c0ab29c76392d5d8f6b72d27194ee38218643 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.WebDashboard/dashboard-ui/scripts/boxset.js
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 23744d644..84ae72393 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -158,6 +158,10 @@ namespace MediaBrowser.Model.Entities /// <summary> /// The subtitle /// </summary> - Subtitle + Subtitle, + /// <summary> + /// The data + /// </summary> + Data } } |