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
..
ajax	clean out autogenerated files	2013-09-12 14:43:57 -04:00
css	Small dark CSS fixes in frames and timeline view	2015-08-17 14:39:41 +02:00
graphics	clean out autogenerated files	2013-09-12 14:43:57 -04:00
includes	followup changes based on comments in #833	2015-05-21 12:23:31 -05:00
js	propagate canEditGroup permission	2015-08-15 13:22:13 -05:00
lang	clean out autogenerated files	2013-09-12 14:43:57 -04:00
views	Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval	2015-08-18 20:20:53 -05:00
Makefile.am	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
skin.php	Fix builtin authentication issue caused by commit 6e5d927	2014-02-14 18:56:27 -06:00