Emmanuel Papin f551b50ec0 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support ... Conflicts: distros/debian8/patches/01_vendor-perl.diff distros/debian8/patches/series		2015-01-04 12:23:29 +01:00
..
Makefile.am	Migrate svn to git	2013-03-17 00:45:21 +01:00
actions.php	Fix confict when pulling master	2014-11-29 03:37:06 +01:00
config.php.in	Merge branch 'mysql2PDO'	2014-03-20 16:48:03 -04:00
control_functions.php	more updates	2013-12-17 11:16:20 -05:00
database.php	fixes WRT to db logging. I believe fixes issue #504	2014-09-26 14:43:58 -04:00
functions.php	replace getLoad() / getDiskPercent() with PHP native functions	2015-01-03 19:22:19 +01:00
lang.php	Update lang.php	2013-08-16 12:05:33 +02:00
logger.php	remove unneccessary quoting and escaping	2013-12-06 15:51:36 -05:00