Merge "Add PIXEL_SIZE and ELLIPSIS property in text-controls" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)
commit24ea337df1049251ab2e47c556edc6e8458f9c93
treed8f59b486135b28bc468ddb0546f026524e16e86
parent264dbea55c45e722c30a17782cdca6da07c59fca
parent66521be1c480614a631f58d77be161e1c247e35f
Merge "Add PIXEL_SIZE and ELLIPSIS property in text-controls" into devel/master
automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
dali-toolkit/devel-api/file.list
dali-toolkit/internal/visuals/text/text-visual.cpp