Merge "Bug fix when creating background of control using ImageActor" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 2 Jul 2015 13:55:10 +0000 (06:55 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 2 Jul 2015 13:55:10 +0000 (06:55 -0700)
commit610da2945e1b56e09b12466b1c23b90aa348abdd
tree54c6cbcf56c751e710aad0a3f1d4f8746c0e43a3
parent079795bcb6a8aab48e5e4252a86f524e6749fcbb
parent9cab36905ea3e42c011a9c278631a7836f2bfdc6
Merge "Bug fix when creating background of control using ImageActor" into devel/master
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.h