projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
83066ea
4062083
)
Merge "Revert the TextLabel to use the old renderer." into devel/master
author
Paul Wisbey
<p.wisbey@samsung.com>
Mon, 7 Nov 2016 10:09:21 +0000
(
02:09
-0800)
committer
Gerrit Code Review
<gerrit@review.vlan103.tizen.org>
Mon, 7 Nov 2016 10:09:22 +0000
(
02:09
-0800)
1
2
automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/file.list
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/visuals/text/text-visual.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/visuals/text/text-visual.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
Simple merge
diff --cc
dali-toolkit/internal/file.list
Simple merge
diff --cc
dali-toolkit/internal/visuals/text/text-visual.cpp
Simple merge
diff --cc
dali-toolkit/internal/visuals/text/text-visual.h
Simple merge