diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-09-05 13:29:22 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-09-05 13:29:22 -0400 |
| commit | 9ba4ea5250c4518c2529d5ab90b49a5ba468de3e (patch) | |
| tree | b02c0e5b5ff0096bcd7a930f8103185ef63e881b /MediaBrowser.Model/System | |
| parent | f559c1fd50b9ef28ecd893fdb7eb520e7242290f (diff) | |
| parent | b3bdb3b21dea4a88a2666e9ea80edd2c17e6ef6d (diff) | |
Merge pull request #1172 from MediaBrowser/master
merge
Diffstat (limited to 'MediaBrowser.Model/System')
| -rw-r--r-- | MediaBrowser.Model/System/PublicSystemInfo.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/SystemInfo.cs | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs index 3afe72e818..b9a3260b01 100644 --- a/MediaBrowser.Model/System/PublicSystemInfo.cs +++ b/MediaBrowser.Model/System/PublicSystemInfo.cs @@ -27,6 +27,12 @@ namespace MediaBrowser.Model.System public string Version { get; set; } /// <summary> + /// Gets or sets the operating sytem. + /// </summary> + /// <value>The operating sytem.</value> + public string OperatingSystem { get; set; } + + /// <summary> /// Gets or sets the id. /// </summary> /// <value>The id.</value> diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 094c4fda62..c8209baa85 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -9,11 +9,6 @@ namespace MediaBrowser.Model.System public class SystemInfo : PublicSystemInfo { /// <summary> - /// Gets or sets the operating sytem. - /// </summary> - /// <value>The operating sytem.</value> - public string OperatingSystem { get; set; } - /// <summary> /// Gets or sets the display name of the operating system. /// </summary> /// <value>The display name of the operating system.</value> @@ -30,7 +25,7 @@ namespace MediaBrowser.Model.System /// </summary> /// <value><c>true</c> if [supports running as service]; otherwise, <c>false</c>.</value> public bool SupportsRunningAsService { get; set; } - + /// <summary> /// Gets or sets the mac address. /// </summary> @@ -108,7 +103,7 @@ namespace MediaBrowser.Model.System /// </summary> /// <value>The cache path.</value> public string CachePath { get; set; } - + /// <summary> /// Gets or sets the log path. /// </summary> @@ -120,7 +115,7 @@ namespace MediaBrowser.Model.System /// </summary> /// <value>The internal metadata path.</value> public string InternalMetadataPath { get; set; } - + /// <summary> /// Gets or sets the transcoding temporary path. /// </summary> |