Emmanuel Papin 6b2c435460 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list ... Conflicts: scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in		2015-05-14 11:12:38 +02:00
..
classic	Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list	2015-05-14 11:12:38 +02:00
mobile	Ran script to replace all Short open tags	2014-12-05 10:44:23 +11:00
xml	Merge pull request #359 from knnniggett/eyezm	2014-07-07 17:57:48 -05:00
Makefile.am	remove the flat subdir	2014-12-01 15:55:22 -05:00