9f3ff787d1
Conflicts: CMakeLists.txt configure.ac db/zm_create.sql.in distros/redhat/archive/zoneminder.el6.spec distros/redhat/zoneminder.el6.spec web/skins/classic/views/monitor.php |
||
---|---|---|
.. | ||
zm-init | ||
zoneminder-1.26.0-dbinstall.patch | ||
zoneminder-1.26.0-defaults.patch | ||
zoneminder-1.28.0-defaults.patch | ||
zoneminder-runlevel.patch | ||
zoneminder.el6.spec |