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
..
classic	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2015-10-23 22:07:22 +11:00
dark	set default border on live streams so that when they alarm they don't jump around	2015-10-02 10:04:56 -04:00
flat	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2015-10-23 22:07:22 +11:00
Makefile.am	Add dark CSS for classic view	2015-07-27 09:53:59 +02:00