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

pull/1494/head
Isaac Connor 2016-05-19 12:08:56 -04:00
commit 8e06c0ec63
2 changed files with 2 additions and 2 deletions

View File

@ -92,7 +92,7 @@ my @daemons = (
'zmwatch.pl', 'zmwatch.pl',
'zmupdate.pl', 'zmupdate.pl',
'zmtrack.pl', 'zmtrack.pl',
'zmtelemetry.pl', 'zmtelemetry.pl'
); );
my $command = shift @ARGV; my $command = shift @ARGV;

View File

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