Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tim Hobbs
2014-03-21 11:40:54 -07:00
7 changed files with 67 additions and 40 deletions

View File

@@ -51,6 +51,11 @@ namespace MediaBrowser.Model.Querying
/// </summary>
DisplayPreferencesId,
/// <summary>
/// The display media type
/// </summary>
DisplayMediaType,
/// <summary>
/// The external urls
/// </summary>