Merge "Make -DUSE_DEFAULT_RESOURCE_DIR=OFF compile again" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 23 Dec 2020 17:11:58 +0000 (17:11 +0000)
committerGerrit Code Review <gerrit@review>
Wed, 23 Dec 2020 17:11:58 +0000 (17:11 +0000)
commitbd126b5d480c08bf7a995b2c4532e80e76ec4ad2
treefc4faba9a053f8bd175feb2fcd97120924da64bd
parentec1db95268e1cf8e8bd893027d45a19c64b32848
parentea014e3440f8df4426bd32d76f07150bd0810d30
Merge "Make -DUSE_DEFAULT_RESOURCE_DIR=OFF compile again" into devel/master
dali-toolkit/internal/controls/control/control-data-impl.cpp