Isaac Connor 1837cc89ea Merge branch 'schrorg-vivotek-ePTZ' into storageareas ... Conflicts: CMakeLists.txt configure.ac version		2016-02-04 12:24:07 -05:00
..
ZoneMinder	Merge branch 'schrorg-vivotek-ePTZ' into storageareas	2016-02-04 12:24:07 -05:00
ZoneMinder.pm	ZoneMinder.pm: minor re-wrapping	2015-04-19 18:15:23 +10:00