[vlc/f28: 26/26] fix merge
commit 5ad87c204c164008abee59e4ce2015932ef810ea
Merge: 69a0f7a 2fad852
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Dec 27 20:41:01 2018 +0000
fix merge
.gitignore | 1 -
mmal_1.patch | 6570 +++++++++++++++++++++
sources | 2 +-
vlc.spec | 57 +-
x264-Fix-build-with-a-newer-version-of-x264.patch | 13 -
5 files changed, 6607 insertions(+), 36 deletions(-)
---