Merge branch 'stage-min-size-rework'
authorEmmanuele Bassi <ebassi@linux.intel.com>
Mon, 1 Mar 2010 15:37:12 +0000 (15:37 +0000)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Mon, 1 Mar 2010 15:37:12 +0000 (15:37 +0000)
* stage-min-size-rework:
  docs: Update minimum size accessors
  actor: Use the TOPLEVEL flag instead of a type check
  [stage] Use min-width/height props for min size

1  2 
clutter/clutter-actor.c
clutter/clutter-stage.c

Simple merge
Simple merge