Emmanuel Papin 9929233e75 Merge branch 'master' into plugin_support_test ... Conflicts: configure.ac web/lang/fr_fr.php		2015-02-25 23:14:25 +01:00
..
debian	Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support	2015-01-04 12:23:29 +01:00
debian8	Update debian changelog file	2015-01-27 19:24:50 +01:00
debian_cmake	* distros/debian -> Autotools	2014-11-11 22:48:04 +01:00
fedora	add psmisc pacakge requirement to rpm specfiles	2015-02-23 08:09:48 -06:00
opensuse	Merge pull request #502 from knnniggett/systemd-2	2014-09-03 15:59:42 -04:00
redhat	add psmisc pacakge requirement to rpm specfiles	2015-02-23 08:09:48 -06:00
ubuntu1204	bump snapshot release	2015-02-13 13:14:50 -05:00