5 Commits

Author	SHA1	Message	Date
Isaac Connor	1291835c45	do some output to tell use what we are doing during update process	2018-01-19 16:32:48 -05:00
Isaac Connor	b25452d4c5	Don't both to add the Floreon control type. That can be done with zmcamtool	2018-01-05 15:47:28 -05:00
Isaac Connor	489d3ba6ed	Merge ../ZoneMinder.master into storageareas	2017-11-21 12:23:17 -05:00
Ognyan Bankov	ded6b1864a	2006 support floureon 1080p 18x 30x (#2007) ... * perl control script for Fluoreon 1080p * DB update for Floureon cameras support	2017-11-18 19:02:23 -05:00
Isaac Connor	085d239a6e	Merge branch 'master' into storageareas	2017-06-13 18:02:28 -04:00