Isaac Connor 69090563d5 Merge branch 'master' into video ... Conflicts: src/CMakeLists.txt src/zm_monitor.cpp		2014-11-28 14:23:05 -05: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	fixes WRT to db logging. I believe fixes issue #504	2014-09-26 14:43:58 -04:00
log.php	handle empty [file] to prevent logzilla	2014-11-13 09:17:54 -05:00
status.php	Merge branch 'master' into video	2014-11-28 14:23:05 -05: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