[clutter: 3/3] fix merge

[Peter Robinson]

commit 4e2f1b858b323cef7b8b921c92221a42ecd5fb06
Merge: c8910b2 95844ed
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jul 5 01:07:11 2011 +0100

    fix merge

 0001-docs-Use-const-instead-G_CONST_RETURN.patch   |   60 ++
 0002-cogl-Use-const-instead-G_CONST_RETURN.patch   |   68 ++
 0003-cally-Use-const-instead-G_CONST_RETURN.patch  |  263 +++++++
 ...-clutter-Use-const-instead-G_CONST_RETURN.patch |  743 ++++++++++++++++++++
 clutter-1.6.16-no-drm-hax.patch                    |   90 +++
 clutter.spec                                       |    7 +
 6 files changed, 1231 insertions(+), 0 deletions(-)
---
diff --cc clutter.spec
index c552083,0c7365b..36cad58
--- a/clutter.spec
+++ b/clutter.spec
@@@ -103,11 -111,14 +103,18 @@@ find %{buildroot} -name '*.la' -exec r
  %{_datadir}/gtk-doc/html/cally
  
  %changelog
 +* Mon Jul  4 2011 Peter Robinson <pbrobinson at gmail.com> - 1.7.4-1
 +- Update to 1.7.4 devel build
 +- Build against cogl
 +- Add patch to fix DSO linking
 +
+ * Fri Jun 24 2011 Adam Jackson <ajax at redhat.com> 1.6.16-3
+ - clutter-1.6.16-no-drm-hax.patch: Remove the insane DRM-banging fallback for
+   sync to vblank.
+ 
+ * Fri Jun 17 2011 Tomas Bzatek <tbzatek at redhat.com> - 1.6.16-2
+ - Fix G_CONST_RETURN usage
+ 
  * Wed Jun 15 2011 Tomas Bzatek <tbzatek at redhat.com> - 1.6.16-1
  - Update to 1.6.16