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 |
|
Andrew Bauer
|
461f81089b
|
change table name from monitors to users
|
2015-08-15 15:42:00 -05:00 |
|
Andrew Bauer
|
c828a3df33
|
typo
|
2015-08-15 12:13:35 -05:00 |
|
Andrew Bauer
|
936aa00a5e
|
add sql bits
|
2015-08-15 12:00:48 -05:00 |
Emmanuel Papin
|
2ccb378e2d
|
Fix a typo error in sql file
|
2015-07-24 00:25:57 +02:00 |
|
Emmanuel Papin
|
649a39b372
|
Replace analysis interval parameter by analysis framerate
|
2015-07-23 16:36:30 -04:00 |
|
Emmanuel Papin
|
d0d72672a7
|
Fix sql files
|
2015-07-22 21:49:06 +02:00 |
|
Emmanuel Papin
|
132e0a1798
|
Add analysis fps paramter to monitors
|
2015-07-22 21:38:35 +02:00 |