projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f6004b9
82031ca
)
Merge "Support align attribute for paragraph tag in markup" into devel/master
author
Bowon Ryu
<bowon.ryu@samsung.com>
Thu, 24 Feb 2022 10:36:34 +0000
(10:36 +0000)
committer
Gerrit Code Review
<gerrit@review>
Thu, 24 Feb 2022 10:36:34 +0000
(10:36 +0000)
1
2
automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/file.list
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/text/markup-processor.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp
Simple merge
diff --cc
dali-toolkit/internal/file.list
Simple merge
diff --cc
dali-toolkit/internal/text/markup-processor.cpp
Simple merge