[xine-ui/el7: 3/3] Merge remote-tracking branch 'origin/master' into el7
commit 5f996efc9edf31c3f77a23e371dce0bf6dbe391c
Merge: 1de8ca1 ee995b2
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Jan 7 16:52:18 2017 +0100
Merge remote-tracking branch 'origin/master' into el7
xine-ui.spec | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
---