review.tizen.org Git - platform/core/uifw/dali-toolkit.git/commit

projects / platform / core / uifw / dali-toolkit.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 60c3fd6 520184a)

author	Bowon Ryu <bowon.ryu@samsung.com>
	Fri, 14 Jun 2024 06:46:56 +0000 (15:46 +0900)
committer	Bowon Ryu <bowon.ryu@samsung.com>
	Fri, 14 Jun 2024 06:46:56 +0000 (15:46 +0900)
commit	dd7514d86f061d2f4f443ae178d425304f0a63b7
tree	4b6c3e26d7933b5aecae84576f0a7e77c4c86238	tree \| snapshot
parent	60c3fd64cce8a9947ccaeb06f3ad3b1055c78525	commit \| diff
parent	520184add39070b3d52bb2db005b54c8f6d94d2a	commit \| diff

Merge branch 'devel/master' into devel/async_text

Change-Id: I69317f45a8aecfdb72ead212ecaef5a12580b3fc

19 files changed:

dali-toolkit/internal/controls/text-controls/text-label-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/text-controls/text-label-impl.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/file.list	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/controller/text-controller-impl.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/controller/text-controller-text-updater.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/controller/text-controller.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/controller/text-controller.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/layouts/layout-engine.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/multi-language-support-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/multi-language-support-impl.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/text-typesetter.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/text-typesetter.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/view-model.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/view-model.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-scroller.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-view.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-view.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/visuals/text/text-visual.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/visuals/text/text-visual.h	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / DALi;