[vlc/f25: 11/11] Merge remote-tracking branch 'origin/master' into f25
commit 2a1d65334eacf4cf8d66b904ff98e31061534052
Merge: 8ab3052 e473e9b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jun 28 17:27:34 2017 +0200
Merge remote-tracking branch 'origin/master' into f25
0001-qt-Prefer-XCB-over-Wayland.patch | 43 +++++++++++++++++++++++++++++++++++
vlc.spec | 8 ++++++-
2 files changed, 50 insertions(+), 1 deletion(-)
---