Merge "APIs for text editor." into devel/master
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 1 Jun 2016 08:40:34 +0000 (01:40 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 1 Jun 2016 08:40:34 +0000 (01:40 -0700)
commitaeef40d5dd70c7d878c7664986913ef2c6675a03
tree72aaecec1666a0c9124ebce661fffcb5729ddd1d
parent1fcc4ed0e91129dff19b946257bcee49560d9748
parent39fc99671f79f683a834406e24edf485752c600d
Merge "APIs for text editor." into devel/master
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/text/layouts/layout-engine.cpp
dali-toolkit/internal/text/text-controller-impl.h
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/internal/text/text-controller.h