[xine-lib/el7: 20/20] Merge remote-tracking branch 'origin/master' into el7
commit 559556fa6cd086ac97f8e731ac2b7dbd437f8dd3
Merge: 35f8751 6fa6e18
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Thu Mar 10 10:14:49 2022 +0100
Merge remote-tracking branch 'origin/master' into el7
.gitignore | 3 ++
sources | 2 +-
xine-lib.spec | 95 +++++++++++++++++++++++++++++++++++++++++++++++++----------
3 files changed, 83 insertions(+), 17 deletions(-)
---