Isaac Connor ffa952419c Merge branch 'mysql2PDO' ... Conflicts: distros/ubuntu1204/changelog scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm web/includes/actions.php		2014-03-20 16:48:03 -04:00
..
Makefile.am	Migrate svn to git	2013-03-17 00:45:21 +01:00
actions.php	Remove zmfix	2013-12-22 16:08:17 +02: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	fixup dbFetchMOnitor	2013-12-06 14:22:07 -05:00
functions.php	Merge branch 'mysql2PDO'	2014-03-20 16:48:03 -04: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