stevegilvarry 33090f2264 Merge branch 'master' into feature-h264-videostorage ...

Conflicts:
	configure.ac
	src/zm_config_defines.h
	src/zm_ffmpeg.h
	web/index.php

2014-05-30 01:55:24 +10:00

..

ZoneMinder

Merge branch 'master' into feature-h264-videostorage

2014-05-30 01:55:24 +10:00

CMakeLists.txt

Initial commit for new zmcamtool.pl script

2014-01-21 16:22:30 -06:00

Makefile.am

Add zmcamtool to autotools file manifest

2014-03-16 07:32:18 -05:00

zm.in

Update zm.in

2013-12-14 09:13:49 -06:00

zmaudit.pl.in

Change COnfig from using the subroutine symbol table to just using a global hash

2013-12-16 16:32:02 -05:00

zmcamtool.pl.in

Imported missing files from master to feature-h264-videostorage

2014-05-30 01:47:52 +10:00

zmcontrol.pl.in

Have Usage() in zmcontrol.pl exit 0 instead of -1

2014-01-02 11:50:39 -05: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

Change COnfig from using the subroutine symbol table to just using a global hash

2013-12-16 16:32:02 -05:00

zmeventdump.in

remake this branch off master instead of off mysql2PDO.

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

zmfilter.pl.in

Revert "Broke zmfilter.pl.in in order to test travis"

2014-01-04 15:10:15 -05:00

zmlogrotate.conf.in

Migrate svn to git

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

zmpkg.pl.in

Remove zmfix

2013-12-22 16:08:17 +02:00

zmtrack.pl.in

Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5

2013-10-01 17:38:51 +03:00

zmtrigger.pl.in

Update zmtrigger.pl.in

2014-04-30 15:07:29 +02:00

zmupdate.pl.in

Update zmupdate.pl.in

2014-03-24 13:35:53 +00:00

zmvideo.pl.in

Merge branch 'master' into feature-h264-videostorage

2014-05-30 01:55:24 +10:00

zmwatch.pl.in

Change COnfig from using the subroutine symbol table to just using a global hash

2013-12-16 16:32:02 -05:00

zmx10.pl.in

COnfig fixes

2014-01-03 09:33:49 -05:00