APHW2 MFGENG 4e080b8a36 Merge branch 'storageareas' into ffmpeg_output ...

Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
	scripts/ZoneMinder/lib/ZoneMinder/Object.pm

2017-11-07 18:25:33 -08:00

..

ZoneMinder

Merge branch 'storageareas' into ffmpeg_output

2017-11-07 18:25:33 -08:00

CMakeLists.txt

Upstream FreeBSD patches (#1926)

2017-06-22 10:14:24 -04:00

zm.in

fix sftp xfers in zmfilter (#1677)

2016-11-07 16:08:43 -05:00

zmaudit.pl.in

make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace

2017-10-27 08:05:35 -07:00

zmcamtool.pl.in

fix spacing, braces, quotes

2017-06-07 15:28:31 -04:00

zmcontrol.pl.in

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06: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

have zmdc.pl update the Servers table with system status information

2017-10-24 15:13:48 -07:00

zmeventdump.in

remake this branch off master instead of off mysql2PDO.

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

zmfilter.pl.in

improve logging of zmfilter

2017-10-27 09:09:12 -07:00

zmlogrotate.conf.in

Migrate svn to git

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

zmpkg.pl.in

Remove zmf, die..die..die

2017-01-16 13:20:05 -08:00

zmsystemctl.pl.in

Merge branch 'master' into storageareas

2017-01-02 09:39:10 -05:00

zmtelemetry.pl.in

Merge branch 'logger_fix' into storageareas

2017-07-05 15:28:44 -04:00

zmtrack.pl.in

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

zmtrigger.pl.in

Merge branch 'master' into storageareas

2017-07-14 10:38:20 -04:00

zmupdate.pl.in

Merge branch 'master' into storageareas

2017-06-13 18:02:28 -04:00

zmvideo.pl.in

update to storageareas version, which changes the sql to use subqueries instead of JOINs

2017-07-14 15:55:08 -04:00

zmwatch.pl.in

use Id instead of id

2017-08-24 10:44:14 -04:00

zmx10.pl.in

switch quotes

2017-01-12 12:54:46 -05:00