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
..
classic	Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp	2015-08-18 14:07:38 -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