ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/web/skins/classic
History
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
..
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 followup changes based on comments in #833 2015-05-21 12:23:31 -05:00
js fix state popup dimensions 2015-06-03 12:22:12 -04:00
lang Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
views Merge branch 'master' into feature-h264-videostorage 2015-06-10 23:09:30 +10: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