Emmanuele Bassi 425fa78a27 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
2009-04-15 18:08:14 +01:00
..
2009-01-20 18:47:50 +00:00
2009-04-03 13:36:30 +01:00
2009-03-10 12:38:04 +00:00
2009-03-13 14:29:27 +00:00