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	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
alarm.php	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
control.php	more updates	2013-12-17 11:07:19 -05:00
event.php	close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session.	2015-04-20 13:06:34 -04:00
log.php	add translate function	2015-05-10 08:10:30 -05:00
status.php	Merge branch 'master' into feature-h264-videostorage	2015-06-10 23:09:30 +10:00
stream.php	the var is remSockFile, not remSocketFile	2014-07-24 11:05:35 -04:00
zone.php	more updates	2013-12-17 11:07:19 -05:00