Merge branch 'text-actor-layout-height'
authorEmmanuele Bassi <ebassi@linux.intel.com>
Wed, 15 Apr 2009 17:08:14 +0000 (18:08 +0100)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Wed, 15 Apr 2009 17:08:14 +0000 (18:08 +0100)
commit425fa78a27b9182f60d64ed08f1b470e96539908
tree5143273418fa4c2456dc88488a38052319f79ec6
parentd4b47af153a31eeac12dc5d2ba7f62fdcde833b1
parentfbd9c59c7cb7901ec208d05416454a68c7329cfd
Merge branch 'text-actor-layout-height'

* text-actor-layout-height:
  [clutter-text] Fix ellipsizing
  Support pango_layout_set_height() in ClutterText

Conflicts:
clutter/clutter-text.c
clutter/clutter-text.c