Merge "Line wrap mode property is added." into devel/master
authorHyunJu Shin <hyunjushin@samsung.com>
Mon, 24 Jul 2017 02:51:07 +0000 (02:51 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 24 Jul 2017 02:51:07 +0000 (02:51 +0000)
commit7cca1061ed3db08d2e7f511a8f6ef707e688703d
treeb44652f5cc7dc75e33586ecd2ede5fe27802bb43
parent6b496cacd2a596235a246c912a6b507a72d67ad4
parent69f5648e5f2dec8fa8d09ea7887438c5ae288c63
Merge "Line wrap mode property is added." into devel/master
automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/internal/text/text-controller.h