projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bc7cb02
3c2a5c7
)
Merge "Changed to use ImfManager for virtual keyboard APIs" into devel/master
author
Kimmo Hoikka
<kimmo.hoikka@samsung.com>
Fri, 3 Mar 2017 18:03:05 +0000
(10:03 -0800)
committer
Gerrit Code Review
<gerrit@review.vlan103.tizen.org>
Fri, 3 Mar 2017 18:03:05 +0000
(10:03 -0800)
1
2
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/text/text-controller-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
Simple merge
diff --cc
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
Simple merge
diff --cc
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
Simple merge
diff --cc
dali-toolkit/internal/text/text-controller-impl.cpp
Simple merge