Merge branch 'text-actor-layout-height'

Browse Source

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

Conflicts:
	clutter/clutter-text.c

...

This commit is contained in:

Emmanuele Bassi

2009-04-15 18:08:14 +01:00

parent 458e6e0356 4aea0d6e48

commit ccb334452e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available