Andrew Bauer 68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp ... Conflicts: CMakeLists.txt configure.ac src/zm_monitor.cpp src/zm_monitor.h version		2015-08-18 14:07:38 -05:00
..
Crud@c3976f1478	Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp	2015-08-18 14:07:38 -05:00
empty	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00