SteveGilvarry 20c295ad0c Merge remote-tracking branch 'upstream/master' into feature-plugins ... Conflicts: .travis.yml CMakeLists.txt Makefile.am bootstrap.sh configure.ac distros/debian8/control distros/debian_cmake/control misc/Makefile.am scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in src/CMakeLists.txt src/Makefile.am src/zm_monitor.cpp src/zm_monitor.h src/zmstreamer.cpp web/lang/ru_ru.php web/skins/classic/css/classic/views/Makefile.am web/skins/classic/css/flat/views/Makefile.am web/skins/classic/views/Makefile.am web/skins/classic/views/js/Makefile.am		2016-04-07 00:00:38 +10:00
..
CMakeLists.txt	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	…
com.zoneminder.systemctl.rules.in	…
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
logcheck	Add an example rules file for logcheck	2016-03-23 09:51:28 -04:00
logrotate.conf.in	…
plugins.conf.in	Add a global configuration file for plugins	2014-11-11 20:59:58 +01:00
syslog.conf.in	…
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