SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: configure.ac src/Makefile.am web/js/Makefile.am		2016-04-05 22:06:14 +10:00
..
console.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
control.css	fix import path	2015-02-25 18:08:41 +02:00
controlcaps.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
devices.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
event.css	Testing videojs for video playback	2015-02-16 19:43:13 +11:00
events.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
export.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
filter.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
frame.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
frames.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
groups.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
log.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
monitor.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
montage.css	set default border on live streams so that when they alarm they don't jump around	2015-10-02 10:04:56 -04:00
montage_2wide.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
montage_3wide.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
montage_3wide50enlarge.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
montage_4wide.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
montage_freeform.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
options.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
plugin.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
stats.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
timeline.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
timeline.css.php	Ran script to replace all Short open tags	2014-12-05 10:44:23 +11:00
video.css	move flat css files into the classic skin.	2014-12-01 15:44:01 -05:00
watch.css	fix import path	2015-02-25 18:09:23 +02:00
zone.css	fix path to the zone point gif	2015-02-19 11:11:01 -05:00