SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h src/zm_remote_camera_rtsp.h web/skins/classic/views/monitor.php		2015-10-23 22:07:22 +11: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 remote-tracking branch 'upstream/master' into feature-h264-videostorage	2015-10-23 22:07:22 +11:00
stream.php	reduce the wait to 2/10ths instead of a whole second	2015-06-05 11:49:05 -04:00
zone.php	more updates	2013-12-17 11:07:19 -05:00