Isaac Connor 67b365948e Merge branch 'storageareas' into zma_to_thread ... Conflicts: src/zm_ffmpeg_camera.cpp src/zm_monitor.cpp web/includes/Monitor.php web/skins/classic/views/js/add_monitors.js web/skins/classic/views/js/console.js		2018-01-29 15:53:26 -05:00
..
debian	Merge branch 'master' into storageareas	2017-07-21 11:04:32 -04:00
opensuse	why did git decide to delete these synlinks???	2017-06-09 12:58:15 -05:00
redhat	make zoneminder rpm depend on zip package	2017-12-14 14:14:31 -06:00
ubuntu1204	Need drop permissions	2018-01-29 11:44:29 -05:00
ubuntu1410	bump versions	2016-04-20 09:38:07 -04:00
ubuntu1504_cmake_split_packages	call zmcamtool during postinst (#2021)	2017-12-10 14:14:39 -05:00
ubuntu1604	Merge branch 'storageareas' into zma_to_thread	2018-01-29 15:53:26 -05:00
fedora	why did git decide to delete these synlinks???	2017-06-09 12:58:15 -05:00