fix merge

2012-03-13 19:20:37 +00:00 · 2012-03-13 19:20:37 +00:00 · 0826730fb0
commit 0826730fb0
parent 33bebca2bf 8b91223815
3 changed files with 8 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@
 /cogl-1.9.2.tar.xz
 /cogl-1.9.4.tar.xz
 /cogl-1.9.6.tar.xz
+/cogl-1.9.8.tar.xz
--- a/cogl.spec
+++ b/cogl.spec
@ -1,5 +1,5 @@
 Name:          cogl
-Version:       1.9.6
+Version:       1.9.8
 Release:       1%{?dist}
 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

 %changelog
-* Wed Mar  7 2012 Brian Pepple <bpepple@fedoraproject.org> - 1.9.6-1
- Update to 1.9.6.
+* Sat Mar 10 2012 Matthias Clasen <mclasen@redhat.com> - 1.9.8-1
+- 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
 - Update to 1.9.4
--- a/2
+++ b/2
@ -1 +1 @@
-a44ba8883d83305e511e76bf85876e40  cogl-1.9.6.tar.xz
+6429636d880c240e6ca5f78282e42bb5  cogl-1.9.8.tar.xz