[zoneminder/f29: 3/3] Merge branch 'master' into f29
commit 49ddcebb2bde32895919c1ad8340d5b08f0c6339
Merge: af2b487 b161175
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sat Dec 8 10:05:45 2018 -0600
Merge branch 'master' into f29
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 225 ++++++++++++++++++++++++++++++++++++++++----------------
3 files changed, 164 insertions(+), 64 deletions(-)
---