Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

2016-05-19 12:08:56 -04:00 · 2016-05-19 12:08:56 -04:00 · 8e06c0ec63
parent 183f9c70a4 8bac5fbdfb
commit 8e06c0ec63
2 changed files with 2 additions and 2 deletions
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@ -92,7 +92,7 @@ my @daemons = (
    'zmwatch.pl',
    'zmupdate.pl',
    'zmtrack.pl',
-    'zmtelemetry.pl',
+    'zmtelemetry.pl'
 );

 my $command = shift @ARGV;
--- a/src/zm_rtp_ctrl.h
+++ b/src/zm_rtp_ctrl.h
@ -123,7 +123,7 @@ private:
      } sdes;

      // BYE
-      struct Bye
+      struct
      {
        uint32_t srcN[];   // list of sources
        // can't express trailing text for reason (what does this mean? it's not even english!)