[gstreamer1-plugins-ugly/el7: 19/19] Merge remote-tracking branch 'origin/master' into el7
commit 42d42a6a04be998754328fbdae8e5adba32e44a4
Merge: 085f2f7 840797b
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Wed Jan 11 00:27:25 2017 +0100
Merge remote-tracking branch 'origin/master' into el7
.gitignore | 3 ++-
gstreamer1-plugins-ugly.spec | 60 +++++++++++++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 49 insertions(+), 16 deletions(-)
---