projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
20e28e5
58b8a3e
)
Merge branch 'devel/master' into devel/graphics
23/256023/1
author
Adeel Kazmi
<adeel.kazmi@samsung.com>
Fri, 26 Mar 2021 16:22:23 +0000
(16:22 +0000)
committer
Adeel Kazmi
<adeel.kazmi@samsung.com>
Fri, 26 Mar 2021 16:22:23 +0000
(16:22 +0000)
Change-Id: I573e8a3631457f1a5604cb88e616fe5dd7035c43
1
2
automated-tests/src/dali/utc-Dali-Actor.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
automated-tests/src/dali/utc-Dali-Actor.cpp
Simple merge