[vlc/f26: 2/2] Merge branch 'master' into f26
commit 5fd0b0887aaa02bce102eb79f74ec5f08cc673f9
Merge: ea339f4 9558ce1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 2 12:12:29 2018 +0100
Merge branch 'master' into f26
sources | 2 +-
vlc.spec | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
---