[vlc/f25: 17/17] Merge branch 'master' into f25
commit 80f31d70f161fd7ff01de257be3dd4b2d9dfb8e9
Merge: a124493 5d47699
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun May 28 02:31:14 2017 +0100
Merge branch 'master' into f25
0001-Fix-lirc-activation-after-detection.patch | 32 ---------
sources | 2 +-
vlc.spec | 93 +++++++++++++++++++++-----
3 files changed, 76 insertions(+), 51 deletions(-)
---