merge conflict

1 files changed, 13 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
index d7ce29b2e..f2550c598 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
@@ -70,6 +70,16 @@ namespace Tango.MachineStudio.UI.ViewModels
             set { _latestVersion = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _updateComments;
+        /// <summary>
+        /// Gets or sets the latest version comments.
+        /// </summary>
+        public String UpdateComments
+        {
+            get { return _updateComments; }
+            set { _updateComments = value; RaisePropertyChangedAuto(); }
+        }
+
         private double _downloadProgress;
 
         public double DownloadProgress
@@ -127,6 +137,7 @@ namespace Tango.MachineStudio.UI.ViewModels
             _updateInfo = msg.UpdateResponse;
             Status = UpdateStatus.UpdateAvailable;
             LatestVersion = _updateInfo.Version;
+            UpdateComments = _updateInfo.Comments;
             StartUpdate();
         }
 
@@ -157,7 +168,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                     {
                         Email = _authentication.CurrentUser.Email,
                         Password = _authentication.CurrentUser.Password,
-                        Version = _application.Version,
+                        Version = _application.Version.ToString(),
                     });
 
                     if (response.IsUpdateAvailable)
@@ -165,6 +176,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                         _updateInfo = response;
                         Status = UpdateStatus.UpdateAvailable;
                         LatestVersion = response.Version;
+                        UpdateComments = response.Comments;
                     }
                     else
                     {