Merge "Add new layouting support for TextLabel and ImageView." into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 5 Jul 2018 15:24:55 +0000 (15:24 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 5 Jul 2018 15:24:55 +0000 (15:24 +0000)
commit59314022f6789147a47a8b098433e211b6185625
tree3a667dfacee551b9c1f9a757edd116acdf769c21
parent5e110a596a3beb09bc6e2f9ae3d3b68d6a30c72c
parenta9a328dcfc54d425f08f78e16623671eb3110fed
Merge "Add new layouting support for TextLabel and ImageView." into devel/master
automated-tests/src/dali-toolkit/utc-Dali-Layouting.cpp
dali-toolkit/internal/controls/image-view/image-view-impl.cpp