Emmanuel Papin 39e6de8f68 Fix conflict when merging from master		2015-01-04 12:29:20 +01:00
..
debian	Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support	2015-01-04 12:23:29 +01:00
debian8	Fix conflict when merging from master	2015-01-04 12:29:20 +01:00
debian_cmake	* distros/debian -> Autotools	2014-11-11 22:48:04 +01:00
fedora	Update zoneminder.cmake.f20.spec	2014-11-24 15:40:45 -06:00
opensuse	Merge pull request #502 from knnniggett/systemd-2	2014-09-03 15:59:42 -04:00
redhat	Merge pull request #594 from ndobbs/feature-ndobbs_selinux_rhel6_support	2014-11-24 17:46:55 -06:00
ubuntu1204	this patch has been applied to master branch and is no longer needed.	2014-12-30 09:49:14 -05:00