SteveGilvarry b3313edde0 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch ... Conflicts: web/skins/classic/views/event.php		2015-03-21 23:49:56 +11:00
..
ZoneMinder	Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch	2015-03-21 23:49:56 +11:00
CMakeLists.txt	rename and process zmsystemctl.pl.in	2014-08-19 17:19:44 -05:00
Makefile.am	rename and process zmsystemctl.pl.in	2014-08-19 17:19:44 -05:00
zm.in	Update zm.in	2014-11-23 11:09:52 -06:00
zmaudit.pl.in	According perldoc DBI we should NOT be calling finish after processing all rows.	2015-02-04 11:15:31 -05:00
zmcamtool.pl.in	Add -v --version command line param to zmcamtool.pl	2015-01-07 08:43:51 -05:00
zmcontrol.pl.in	introduce the quit command which makes the resident zmcontrol.pl exit	2015-01-07 16:37:26 -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	Add -v --version command line param to zmdc.pl	2015-01-07 08:47:32 -05:00
zmeventdump.in	remake this branch off master instead of off mysql2PDO.	2013-11-01 09:47:28 -04:00
zmfilter.pl.in	minor improvement removing 1 coll to time()	2015-02-06 09:30:48 -05:00
zmlogrotate.conf.in	Migrate svn to git	2013-03-17 00:45:21 +01:00
zmpkg.pl.in	Add -v --version command line param to zmpkg.pl	2015-01-07 09:05:16 -05:00
zmsystemctl.pl.in	Add version to the usage line in zmsystemctl.pl	2015-01-07 09:07:40 -05:00
zmtrack.pl.in	fix a bare ZM_PATH_BIN which should be $Config{ZM_PATH_BIN}	2014-12-17 16:35:30 -05:00
zmtrigger.pl.in	Update zmtrigger.pl.in	2014-04-30 15:07:29 +02:00
zmupdate.pl.in	fix putting the mode back. I merged it to the wrong place	2014-11-19 13:54:10 -05:00
zmvideo.pl.in	Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch	2015-02-17 23:16:42 +11: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	Add version to the usage line in zmx10.pl	2015-01-07 09:14:00 -05:00