Merge "Note that some Text propeties in devel api can't be changed" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 27 Jul 2017 08:56:30 +0000 (08:56 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 27 Jul 2017 08:56:30 +0000 (08:56 +0000)
commit24d391fe222bd0fd5910e3b3481124fa23b796be
tree438d4545d363113d882d0638383ec994662a8f74
parentb5967a328022a3d60e341feea6dfd27e42530690
parentb904b864bc3875b6cb0bdfa2ad430d094c140205
Merge "Note that some Text propeties in devel api can't be changed" into devel/master
dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
dali-toolkit/devel-api/controls/text-controls/text-field-devel.h