[gxine/el7: 7/7] Merge remote-tracking branch 'origin/master' into el7
commit 42ada4ec9eb55df86138e238b392f3c4798c9480
Merge: a680239 193c65d
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon Dec 18 22:39:25 2017 +0100
Merge remote-tracking branch 'origin/master' into el7
.gitignore | 1 +
gxine-0.5.909-fix_desktop_file.patch | 19 +++++++++++++++++++
gxine.spec | 18 +++++++++++++++++-
sources | 2 +-
4 files changed, 38 insertions(+), 2 deletions(-)
---