fix merge
This commit is contained in:
commit
0826730fb0
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
|||||||
/cogl-1.9.2.tar.xz
|
/cogl-1.9.2.tar.xz
|
||||||
/cogl-1.9.4.tar.xz
|
/cogl-1.9.4.tar.xz
|
||||||
/cogl-1.9.6.tar.xz
|
/cogl-1.9.6.tar.xz
|
||||||
|
/cogl-1.9.8.tar.xz
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
Name: cogl
|
Name: cogl
|
||||||
Version: 1.9.6
|
Version: 1.9.8
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A library for using 3D graphics hardware to draw pretty pictures
|
Summary: A library for using 3D graphics hardware to draw pretty pictures
|
||||||
|
|
||||||
@ -102,8 +102,11 @@ rm %{buildroot}%{_datadir}/cogl/examples-data/crate.jpg
|
|||||||
%{_datadir}/gtk-doc/html/cogl-2.0-experimental
|
%{_datadir}/gtk-doc/html/cogl-2.0-experimental
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Mar 7 2012 Brian Pepple <bpepple@fedoraproject.org> - 1.9.6-1
|
* Sat Mar 10 2012 Matthias Clasen <mclasen@redhat.com> - 1.9.8-1
|
||||||
- Update to 1.9.6.
|
- Update to 1.9.8
|
||||||
|
|
||||||
|
* Sat Feb 25 2012 Matthias Clasen <mclasen@redhat.com> - 1.9.6-1
|
||||||
|
- Update to 1.9.6
|
||||||
|
|
||||||
* Tue Jan 17 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.9.4-1
|
* Tue Jan 17 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.9.4-1
|
||||||
- Update to 1.9.4
|
- Update to 1.9.4
|
||||||
|
Loading…
Reference in New Issue
Block a user