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
mobile	fix montage view issue in mobile skin	2015-06-26 08:47:20 -05:00
xml	add translate function	2015-05-10 08:10:30 -05:00
Makefile.am	remove the flat subdir	2014-12-01 15:55:22 -05:00