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
..
debian	Remove no longer needed patch because applied to master	2015-01-03 14:13:41 +01:00
debian8	Switch debian8 folder to native source format	2015-01-15 21:32:01 +01:00
debian_cmake	* distros/debian -> Autotools	2014-11-11 22:48:04 +01:00
fedora	Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support	2015-02-18 18:53:47 -06:00
opensuse	Merge pull request #502 from knnniggett/systemd-2	2014-09-03 15:59:42 -04:00
redhat	Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support	2015-02-18 18:53:47 -06:00
ubuntu1204	bump snapshot release	2015-02-13 13:14:50 -05:00