SteveGilvarry 9b06b1399c Merge branch 'master' into feature-h264-videostorage ...

Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
	src/zm_ffmpeg_camera.cpp
	web/skins/classic/views/event.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/timeline.php

2015-06-10 23:09:30 +10:00

..

ZoneMinder

Merge pull request #838 from ZoneMinder/zmaudit_update1

2015-05-21 12:10:08 -05: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

zm.in: tabs-to-spaces

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

zmaudit.pl.in

Remove with {ZM_PATH_SWAP}

2015-05-14 10:27:11 -04:00

zmcamtool.pl.in

zmcamtool.pl: readability

2015-04-11 00:35:40 +10:00

zmcontrol.pl.in

zmcontrol.pl: pod2usage (draft) + minor readability improvements.

2015-04-11 11:15:56 +10: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

Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work

2015-05-17 17:18:54 -07:00

zmeventdump.in

remake this branch off master instead of off mysql2PDO.

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

zmfilter.pl.in

zmfilter.pl: pod2usage + beautification

2015-04-11 11:18:21 +10:00

zmlogrotate.conf.in

Migrate svn to git

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

zmpkg.pl.in

Undid ZM_VERSION hacks

2015-05-18 21:44:41 -07:00

zmsystemctl.pl.in

zmsystemctl.pl: pod2usage

2015-04-16 14:38:27 +10:00

zmtrack.pl.in

autouse Data::Dumper

2015-04-16 15:48:51 +10:00

zmtrigger.pl.in

autouse Data::Dumper

2015-04-16 15:48:51 +10:00

zmupdate.pl.in

Undo ZM_VERSION changes

2015-05-18 21:55:00 -07:00

zmvideo.pl.in

Merge branch 'master' into feature-h264-videostorage

2015-06-10 23:09:30 +10:00

zmwatch.pl.in

autouse Data::Dumper

2015-04-16 15:48:51 +10:00

zmx10.pl.in

Correct bareword config entries with newer {} style

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