commit afd59889da0be4506958e04fc973cb372521bb8a Merge: 4b82bf0 f4e98d5 Author: Xavier Bachelot <xavier(a)bachelot.org&gt; Date: Fri Jan 12 10:50:53 2018 +0100 Merge branch 'master' into el7 .gitignore | 1 + sources | 2 +- xine-lib.spec | 27 ++++++++++++++++++--------- 3 files changed, 20 insertions(+), 10 deletions(-) ---