[gxine/el7: 3/3] Merge remote-tracking branch 'origin/master' into el7
commit 31a2fc938660fea72749bfd4bb275e8a95bbe8d6
Merge: 42ada4e 018f13f
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon Jan 1 15:05:36 2018 +0100
Merge remote-tracking branch 'origin/master' into el7
.gitignore | 1 +
gxine-0.5.909-fix_desktop_file.patch | 19 -------------------
gxine.spec | 27 +++++++++++++++------------
sources | 2 +-
4 files changed, 17 insertions(+), 32 deletions(-)
---