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
..
2013-11-04 09:56:40 +02:00
2015-11-14 15:35:04 +11:00
2013-12-24 11:07:27 +00:00
2016-04-07 00:00:38 +10:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2014-10-22 10:31:23 -04:00
2013-09-07 15:08:09 -05:00
2013-09-07 15:08:09 -05:00
2013-09-10 13:14:16 -05:00
2014-01-05 08:59:09 +02:00
2014-07-09 11:44:07 -04:00
2014-08-27 09:42:06 -04:00
2014-10-18 15:23:13 -05:00
2015-11-14 15:33:02 +11:00
2015-08-26 11:20:22 -04:00
2015-07-22 21:38:35 +02:00
2015-08-18 20:20:53 -05:00
2015-09-17 15:16:05 -04:00
2015-08-17 15:05:17 +02:00
2015-08-18 20:20:53 -05:00
2015-08-29 07:53:08 -05:00
2015-08-29 07:53:08 -05:00
2015-11-11 16:43:57 -05:00
2015-10-24 17:58:20 -04:00
2016-01-22 10:46:46 -06:00
2016-01-22 10:48:47 -06:00
2016-01-01 10:15:36 -06:00
2016-04-04 15:14:42 -04:00