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)
Change-Id: I612dafb547931f225fb9bd4d7dc42dd008a62543

1  2 
dali/integration-api/scene.cpp

Simple merge