SteveGilvarry 9b06b1399c Merge branch 'master' into feature-h264-videostorage ... Conflicts: scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in src/zm_ffmpeg_camera.cpp web/skins/classic/views/event.php web/skins/classic/views/monitor.php web/skins/classic/views/timeline.php		2015-06-10 23:09:30 +10:00
..
Makefile.am	Migrate svn to git	2013-03-17 00:45:21 +01:00
actions.php	Merge pull request #696 from ZoneMinder/improve_deleteEvent	2015-02-09 07:15:27 -06:00
config.php.in	Don't show ONVIf probe link when ONVIF support is not enabled	2015-02-21 11:12:07 -06:00
control_functions.php	add sendControlCommand function to do the heavy work of sending zmcontrol a command	2015-01-07 16:24:07 -05:00
database.php	fixes WRT to db logging. I believe fixes issue #504	2014-09-26 14:43:58 -04:00
functions.php	Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch	2015-02-17 23:16:42 +11:00
lang.php	add translate function	2015-05-10 08:10:30 -05:00
logger.php	remove unneccessary quoting and escaping	2013-12-06 15:51:36 -05:00