Isaac Connor ca07b951cb Merge branch 'master' into newpointone ...

Conflicts:
	docs/installationguide/ubuntu.rst

2015-12-21 12:41:25 -05:00

..

ZoneMinder

Merge branch 'master' into newpointone

2015-12-21 12:41:25 -05:00

CMakeLists.txt

fix pod2man generation for out-of-source builds

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

Makefile.am

remove comment at end of line

2015-11-10 14:46:12 -05:00

zm.in

zm.in: tabs-to-spaces

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

zmaudit.pl.in

Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field

2015-10-06 09:30:10 -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

Use Event->delete instead of our own delete code

2015-12-21 12:31:48 -05:00

zmlogrotate.conf.in

Migrate svn to git

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

zmpkg.pl.in

Add Info line on startup saying which Server it is loading for

2015-10-02 12:33:09 +00: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

Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version

2015-12-03 10:23:19 +11:00

zmvideo.pl.in

implement the options to generate videos for events specified by a stored filter. Also implement ability to generate a concatenated video of all events specified by the filter.

2015-12-17 14:36:40 -05:00

zmwatch.pl.in

merge master

2015-09-24 10:01:27 -04:00

zmx10.pl.in

Correct bareword config entries with newer {} style

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