[rtmpdump/el7: 9/9] Merge branch 'master' into el7
commit 46035d61c3601a61b2a17ab686a1fb5498aee772
Merge: a33a0d5 acc2433
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Tue Aug 23 12:04:11 2016 -0600
Merge branch 'master' into el7
Conflicts:
rtmpdump.spec
sources
.gitignore | 3 ++-
rtmpdump.spec | 42 +++++++++++++++++++++++++++++++++---------
sources | 2 +-
3 files changed, 36 insertions(+), 11 deletions(-)
---