Fix merge conflict
This commit is contained in:
commit
91eab08b03
2
.gitignore
vendored
2
.gitignore
vendored
@ -9,3 +9,5 @@
|
||||
/gst-plugins-base-1.0.5.tar.xz
|
||||
/gst-plugins-base-1.0.6.tar.xz
|
||||
/gst-plugins-base-1.0.7.tar.xz
|
||||
/gst-plugins-base-1.0.8.tar.xz
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
%global majorminor 1.0
|
||||
|
||||
Name: gstreamer1-plugins-base
|
||||
Version: 1.0.7
|
||||
Release: 2%{?dist}
|
||||
Version: 1.0.8
|
||||
Release: 1%{?dist}
|
||||
Summary: GStreamer streaming media framework base plugins
|
||||
|
||||
License: LGPLv2+
|
||||
@ -333,6 +333,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jul 13 2013 Brian Pepple <bpepple@fedoraproject.org> - 1.0.8-1
|
||||
- Update to 1.0.8.
|
||||
|
||||
* Wed May 29 2013 Daniel Drake <dsd@laptop.org> - 1.0.7-2
|
||||
- Upstream patch to fix contrast/brightness in video playback
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user