zoneminder/misc
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
..
CMakeLists.txt Add cmake support 2015-05-31 02:37:58 +02:00
Makefile.am Add cmake support 2015-05-31 02:37:58 +02:00
apache.conf.in Update apache.conf.in 2015-08-22 08:56:47 -05:00
com.zoneminder.systemctl.policy.in full systemd support 2014-08-10 08:47:11 -05:00
com.zoneminder.systemctl.rules.in full systemd support 2014-08-10 08:47:11 -05:00
libzoneminder.pc.in Do not use 'using namespace' in header files and raise an error if engine versions mismatch 2015-06-07 20:40:33 +02:00
logrotate.conf.in Migrate svn to git 2013-03-17 00:45:21 +01:00
plugins.conf.in Add a global configuration file for plugins 2014-11-11 20:59:58 +01:00
syslog.conf.in Migrate svn to git 2013-03-17 00:45:21 +01:00
zoneminder-tmpfiles.conf.in Use tmpfiles.d to manage tmpdir and sockdir 2015-03-31 20:30:27 -05:00
zoneminder.service.in Update zoneminder.service.in 2014-11-06 17:42:40 -06:00