SteveGilvarry
|
0277a66700
|
Remove eyezm from distros and Cmake.
Conflicts:
distros/debian8/control
|
2016-02-26 22:41:27 +11:00 |
Andy Bauer
|
9f3ff787d1
|
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
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
|
2015-02-18 18:53:47 -06:00 |
Andrew Bauer
|
c619dded76
|
reorganize files to allow el6 and el7 files to exist simultaneously
|
2015-02-08 17:56:44 -06:00 |
Andrew Bauer
|
6aac41b06f
|
Redhat and Fedora distro folder housekeeping
|
2014-10-05 09:54:29 -05:00 |