[vlc/el7: 9/9] Merge branch 'master' into el7
commit c442cb728e648d4ec7ff8677780844eaca251010
Merge: 6dd569e 0909abc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 18 10:14:59 2019 +0200
Merge branch 'master' into el7
vlc.spec | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
---