Evas textblock: merged changes.
authortasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 21 Sep 2010 15:39:26 +0000 (15:39 +0000)
committertasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 21 Sep 2010 15:39:26 +0000 (15:39 +0000)
commitdd2c85ad9c40d3cc84490b4b19e9ee3f61a973e1
treebfc7d390efdfedba2c44ec8147ddac145f4dfb69
parent3ee76b5e3a749da01a3c2bbc0f083085fd6e713c
Evas textblock: merged changes.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@52544 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
src/lib/canvas/evas_object_textblock.c