SteveGilvarry b3313edde0 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch ... Conflicts: web/skins/classic/views/event.php		2015-03-21 23:49:56 +11:00
..
ajax	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
css	Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch	2015-03-21 23:49:56 +11:00
graphics	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
includes	Merge branch 'control_improvements'	2014-12-08 16:52:52 -05:00
js	Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support	2015-02-18 18:53:47 -06:00
lang	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
views	Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch	2015-03-21 23:49:56 +11:00
Makefile.am	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
skin.php	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00