Files
zoneminder/scripts
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
..
2014-11-23 11:09:52 -06:00
2013-03-17 00:45:21 +01:00
2013-03-17 00:45:21 +01:00
2014-04-30 15:07:29 +02:00