Merge branch 'devel/master' into tizen
authorseungho <seungho@seungho.tn.corp.samsungelectronics.net>
Wed, 28 Oct 2020 12:22:13 +0000 (21:22 +0900)
committerseungho <seungho@seungho.tn.corp.samsungelectronics.net>
Wed, 28 Oct 2020 12:22:13 +0000 (21:22 +0900)
commit0123abac486f786c93356511752fd97cff4f8ea9
tree8060328eae91845f8a3ce4230efd642ab52f046e
parent7f981181e68a6884db3a26c5e3102b4238b4a912
parent3bf9042489df14509cdd410b4f41b619e9b48d0a
Merge branch 'devel/master' into tizen

Change-Id: I612dafb547931f225fb9bd4d7dc42dd008a62543
dali/integration-api/scene.cpp