[vlc/el7: 9/9] Merge branch 'master' into el7
commit 626b4ca30e45d0dd9bb879807a372d0faad0e3ab
Merge: c442cb7 066f97b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Aug 20 09:23:46 2019 +0200
Merge branch 'master' into el7
0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch | 39 +++++++++++++++++++++++++++
sources | 2 +-
vlc.spec | 28 ++++++++++++++++---
3 files changed, 64 insertions(+), 5 deletions(-)
---