Isaac Connor 5a363273a2 Merge branch 'master' into multi-server ...

Conflicts:
	distros/ubuntu1504/changelog

2015-07-16 16:37:44 -04:00

..

ZoneMinder

add error handling on failure to open serial port

2015-07-15 16:02:02 -04:00

CMakeLists.txt

fix pod2man generation for out-of-source builds

2015-07-09 19:33:06 -05:00

Makefile.am

rename and process zmsystemctl.pl.in

2014-08-19 17:19:44 -05:00

zm.in

zm.in: tabs-to-spaces

2015-04-16 14:26:31 +10:00

zmaudit.pl.in

Remove with {ZM_PATH_SWAP}

2015-05-14 10:27:11 -04:00

zmcamtool.pl.in

zmcamtool.pl: readability

2015-04-11 00:35:40 +10:00

zmcontrol.pl.in

improve log

2015-07-15 16:06:55 -04:00

zmdbbackup.in

remake this branch off master instead of off mysql2PDO.

2013-11-01 09:47:28 -04:00

zmdbrestore.in

Migrate svn to git

2013-03-17 00:45:21 +01:00

zmdc.pl.in

fix. without this zmc won't restart automatically

2015-07-15 16:08:02 -04:00

zmeventdump.in

remake this branch off master instead of off mysql2PDO.

2013-11-01 09:47:28 -04:00

zmfilter.pl.in

Add ServerId as a filter option

2015-07-15 16:12:35 -04:00

zmlogrotate.conf.in

Migrate svn to git

2013-03-17 00:45:21 +01:00

zmpkg.pl.in

Only load monitors for our server if ZM_SERVER_ID is specified

2015-07-15 16:18:05 -04:00

zmsystemctl.pl.in

Modify zmsystemctl pod documentation

2015-06-20 16:13:40 -05:00

zmtrack.pl.in

autouse Data::Dumper

2015-04-16 15:48:51 +10:00

zmtrigger.pl.in

Merge branch 'master' into multi-server

2015-07-16 16:37:44 -04:00

zmupdate.pl.in

Undo ZM_VERSION changes

2015-05-18 21:55:00 -07:00

zmvideo.pl.in

autouse Data::Dumper

2015-04-16 15:48:51 +10:00

zmwatch.pl.in

Only load the monitors for our server

2015-07-15 16:24:01 -04:00

zmx10.pl.in

Correct bareword config entries with newer {} style

2015-05-27 10:00:24 -04:00