projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6c306aa
cecc607
)
Merge branch 'devel/master' into devel/graphics
23/258323/1
author
Adeel Kazmi
<adeel.kazmi@samsung.com>
Thu, 13 May 2021 11:40:27 +0000
(12:40 +0100)
committer
Adeel Kazmi
<adeel.kazmi@samsung.com>
Thu, 13 May 2021 11:40:27 +0000
(12:40 +0100)
Change-Id: I53e6732c9c6b37a457cf27697fa3ccea37714915
1
2
automated-tests/src/dali/utc-Dali-Actor.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali/internal/common/core-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali/internal/render/renderers/render-renderer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
automated-tests/src/dali/utc-Dali-Actor.cpp
Simple merge
diff --cc
dali/internal/common/core-impl.cpp
Simple merge
diff --cc
dali/internal/render/renderers/render-renderer.cpp
Simple merge
projects / platform / core / uifw / dali-core.git / commitdiff