[vlc/el7: 5/5] Merge branch 'master' into el7
commit e604069f349341ebc1cde3b9e43f9416bcd0e2af
Merge: 69408fc 9dde866
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Apr 28 12:44:39 2020 +0200
Merge branch 'master' into el7
sources | 2 +-
vlc.spec | 14 +++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
---