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
..
classic	Merge branch 'master' into feature-h264-videostorage	2015-06-10 23:09:30 +10:00
mobile	followup changes based on comments in #833	2015-05-21 12:23:31 -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