[xine-lib/f31: 3/3] Merge remote-tracking branch 'origin/master' into f31
commit c5f1af2a4c5d6588d6c8c4546a41d23f262c027c
Merge: e2319bb d7b210e
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Dec 14 22:40:13 2019 +0100
Merge remote-tracking branch 'origin/master' into f31
.gitignore | 1 +
sources | 2 +-
xine-lib.spec | 23 +++++++++++------------
3 files changed, 13 insertions(+), 13 deletions(-)
---