Fix merge errors
This commit is contained in:
commit
88590be38f
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
/gst-plugins-bad-free-1.0.0.tar.xz
|
||||
/gst-plugins-bad-free-1.0.1.tar.xz
|
||||
/gst-plugins-bad-free-1.0.2.tar.xz
|
||||
/gst-plugins-bad-free-1.0.3.tar.xz
|
||||
|
@ -8,7 +8,7 @@
|
||||
%endif
|
||||
|
||||
Name: gstreamer1-plugins-bad-free
|
||||
Version: 1.0.2
|
||||
Version: 1.0.3
|
||||
Release: 1%{?dist}
|
||||
Summary: GStreamer streaming media framework "bad" plugins
|
||||
|
||||
@ -251,6 +251,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
|
||||
%{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
|
||||
|
||||
%changelog
|
||||
* Wed Nov 21 2012 Brian Pepple <bpepple@fedoraproject.org> - 1.0.3-1
|
||||
- Update to 1.0.3
|
||||
|
||||
* Thu Oct 25 2012 Brian Pepple <bpepple@fedoraproject.org> - 1.0.2-1
|
||||
- Update to 1.0.2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user