projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b5967a3
b904b86
)
Merge "Note that some Text propeties in devel api can't be changed" into devel/master
author
Adeel Kazmi
<adeel.kazmi@samsung.com>
Thu, 27 Jul 2017 08:56:30 +0000
(08:56 +0000)
committer
Gerrit Code Review
<gerrit@review.ap-northeast-2.compute.internal>
Thu, 27 Jul 2017 08:56:30 +0000
(08:56 +0000)
1
2
dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
Simple merge
diff --cc
dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
Simple merge