projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4a4a9f5
fe2eb6e
)
Merge "Fixes cursor status when editing with popup or grab handle." into devel/master
author
Paul Wisbey
<p.wisbey@samsung.com>
Thu, 20 Aug 2015 15:09:53 +0000
(08:09 -0700)
committer
Gerrit Code Review
<gerrit@review.vlan103.tizen.org>
Thu, 20 Aug 2015 15:09:54 +0000
(08:09 -0700)
1
2
dali-toolkit/internal/text/text-controller-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/text/text-controller.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dali-toolkit/internal/text/text-controller-impl.cpp
Simple merge
diff --cc
dali-toolkit/internal/text/text-controller.cpp
Simple merge