commit 85d668d21bc61b421d91969e16e59159830550af Merge: 5f996ef 9118569 Author: Xavier Bachelot <xavier(a)bachelot.org&gt; Date: Mon Jan 1 15:04:24 2018 +0100 Merge remote-tracking branch 'origin/master' into el7 .gitignore | 1 + sources | 2 +- xine-ui.spec | 37 ++++++++++++++++++++----------------- 3 files changed, 22 insertions(+), 18 deletions(-) ---