SteveGilvarry a700cbffdb Merge remote-tracking branch 'upstream/master' into feature-plugins ...

Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/es_es.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/views/monitor.php

2015-11-08 21:06:21 +11:00

..

ZoneMinder

Merge remote-tracking branch 'upstream/master' into feature-plugins

2015-11-08 21:06:21 +11:00

CMakeLists.txt

fix pod2man generation for out-of-source builds

2015-07-09 19:33:06 -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

Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field

2015-10-06 09:30:10 -04:00

zmcamtool.pl.in

zmcamtool.pl: readability

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

zmcontrol.pl.in

improve log

2015-07-15 16:06:55 -04: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

fix. without this zmc won't restart automatically

2015-07-15 16:08:02 -04: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

whitespacing

2015-08-26 12:08:10 -04:00

zmsystemctl.pl.in

Modify zmsystemctl pod documentation

2015-06-20 16:13:40 -05:00

zmtrack.pl.in

autouse Data::Dumper

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

zmtrigger.pl.in

Merge pull request #941 from ZoneMinder/trigger_on_space

2015-07-16 13:09:36 -05:00

zmupdate.pl.in

Update version check URL

2015-10-23 11:45:32 -06:00

zmvideo.pl.in

autouse Data::Dumper

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

zmwatch.pl.in

add debug statements for when LastWriteTime is not defined.

2015-09-24 09:57:58 -04:00

zmx10.pl.in

Correct bareword config entries with newer {} style

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