Isaac Connor 22df150cb2 Merge branch 'storageareas' into zma_to_thread ...

Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp

2018-01-17 13:59:34 -05:00

..

ZoneMinder

Merge branch 'storageareas' into zma_to_thread

2018-01-16 17:55:08 -05:00

CMakeLists.txt

fix missing }

2018-01-10 12:56:36 -05:00

zm.in

fix sftp xfers in zmfilter (#1677)

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

zmaudit.pl.in

Fix re for identifying event when using Medium storage scheme

2018-01-10 15:36:36 -05: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

Merge branch 'storageareas' into zma_to_thread

2018-01-17 13:59:34 -05:00

zmeventdump.in

remake this branch off master instead of off mysql2PDO.

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

zmfilter.pl.in

Fix when specifying by filter_id or filter_name. Probably a botched merge.

2018-01-02 07:10:38 -08:00

zmlogrotate.conf.in

Migrate svn to git

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

zmpkg.pl.in

Merge branch 'storageareas' into zma_to_thread

2018-01-17 13:59:34 -05:00

zmstats.pl.in

FIX update interval.

2018-01-16 09:32:18 -05: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

revert to using the mysql client to do updates. We need it for delemiter changes when adding triggers

2018-01-04 17:16:43 -05: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

:Merge branch 'storageareas' into zma_to_thread

2018-01-14 18:14:02 -05:00

zmx10.pl.in

switch quotes

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