Merge remote-tracking branch 'origin/master'

2019-06-07 16:50:47 +02:00 · 2019-06-07 16:50:47 +02:00 · a1aa2847e1
parent c41a8a467c 60edbdd08b
commit a1aa2847e1
3 changed files with 2 additions and 2 deletions
--- a/FrontEnd/Communicator.cs
+++ b/FrontEnd/Communicator.cs
@ -21,7 +21,7 @@ namespace FrontEnd

        override public string ToString()
        {
-            return $"Id: {Id}, Label: {Label}, Status {Status}\n" +
+            return $"Id: {Id}, Label: {Label}, Status: {Status}\n" +
                   $"ClientID: {Client_Id}, Ip : {Ip}\n" +
                   $"X: {X}  Y: {Y}  Angle: {Angle}";
        }
@ -38,7 +38,7 @@ namespace FrontEnd

        override public string ToString()
        {
-            return $"Id: {Id}, Label: {Label}, Status {Status}\n" +
+            return $"Id: {Id}, Label: {Label}, Status: {Status}\n" +
                   $"Ip : {Ip}\n" +
                   $"X: {X}  Y: {Y}";
        }
--- a/FrontEnd/Images/cam_green.png
+++ b/FrontEnd/Images/cam_green.png
--- a/FrontEnd/Images/cam_red.png
+++ b/FrontEnd/Images/cam_red.png