fix merge

This commit is contained in:
Peter Robinson 2012-09-03 23:04:50 +01:00
commit 9bfe0217a5

View File

@ -100,7 +100,7 @@ rm %{buildroot}%{_datadir}/cogl/examples-data/crate.jpg
%{_datadir}/gtk-doc/html/cogl-2.0-experimental
%changelog
* Thu Aug 16 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.11.2-1
* Tue Aug 21 2012 Richard Hughes <hughsient@gmail.com> - 1.11.2-1
- Update to 1.11.2
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.4-2