Merge branch 'cairo-texture'
authorEmmanuele Bassi <ebassi@linux.intel.com>
Fri, 19 Dec 2008 16:44:40 +0000 (16:44 +0000)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Fri, 19 Dec 2008 16:44:40 +0000 (16:44 +0000)
commit8d98c28dfa7d5be746f1aa8b351e4e8fea9ee3a7
treefcee239af1c6342ce64acea500851fc96fcf04f0
parent5560157428e8fcfde5a903878eace9134475d318
parent64de0411eaaffd5237c45475645005d282db05cf
Merge branch 'cairo-texture'

* cairo-texture:
  [cairo-texture] Remove the construct only restriction on surface size
  [cairo-texture] Silently discard 0x0 surfaces
  Re-indent ClutterPath header
  Add a test case for the new cairo path functions
  Add clutter_path_to_cairo_path and clutter_path_add_cairo_path
  Warn instead of returning in the IN_PAINT check
  Small documentation fixes
  Print a warning when creating a cairo_t while painting
  Do not set the IN_PAINT flag inside the Stage paint
  Set the IN_PAINT private flag
  [docs] Add ClutterCairoTexture to the API reference
  Add ClutterCairoTexture
  Require Cairo as a Clutter dependency

Conflicts:

  Fix merge conflict in clutter/clutter-path.h
clutter/clutter-actor.c
clutter/clutter-path.c
clutter/clutter-path.h
tests/conform/test-path.c