projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5b50693
9a0f3f2
)
Merge changes I17acf67f,If2410a4d into devel/master
author
Adeel Kazmi
<adeel.kazmi@samsung.com>
Thu, 18 Jun 2020 11:02:13 +0000
(11:02 +0000)
committer
Gerrit Code Review
<gerrit@review>
Thu, 18 Jun 2020 11:02:13 +0000
(11:02 +0000)
* changes:
Image class Usage Removal
Remove ResourceImage Usage
1
2
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/public-api/controls/control.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
Simple merge
diff --cc
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
Simple merge
diff --cc
dali-toolkit/public-api/controls/control.h
Simple merge