Merge branch 'devel/master' into devel/async_text
authorBowon Ryu <bowon.ryu@samsung.com>
Wed, 24 Jul 2024 06:38:18 +0000 (15:38 +0900)
committerBowon Ryu <bowon.ryu@samsung.com>
Wed, 24 Jul 2024 06:38:18 +0000 (15:38 +0900)
commitc3cec33e3c67e7a90f811f287d6b784a91a6996b
tree0e80dd857d4728c315bb62b18a96ce95dca6c193
parent76b2a497b45fb5100cfd43ebb85ddeb99ef5527f
parent4ed9f38e37c6562be5218a43514302f1bdf50aad
Merge branch 'devel/master' into devel/async_text

Change-Id: Ic939ffd53dcbf6ec3dc92859646fcfe72bee0db7
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/file.list
dali-toolkit/internal/text/layouts/layout-engine.cpp
dali-toolkit/internal/text/rendering/text-typesetter.cpp