projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
baeb5ad
09ae840
)
Merge changes Ia2ec4b45,Ied29583a into devel/master
author
Paul Wisbey
<p.wisbey@samsung.com>
Tue, 22 Nov 2016 16:04:04 +0000
(08:04 -0800)
committer
Gerrit Code Review
<gerrit@review.vlan103.tizen.org>
Tue, 22 Nov 2016 16:04:04 +0000
(08:04 -0800)
* changes:
Text - First Page Renderer implementation.
ModelView implementation.
1
2
dali-toolkit/internal/text/text-controller.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dali-toolkit/internal/text/text-controller.cpp
Simple merge