zoneminder/web/skins
Andrew Bauer fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
2015-08-18 20:20:53 -05:00
..
classic Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval 2015-08-18 20:20:53 -05: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