Merge "CMake - Option added to define the default toolkit resource path." into devel...

author Adeel Kazmi <adeel.kazmi@samsung.com>

Thu, 2 Apr 2020 14:46:48 +0000 (14:46 +0000)

committer Gerrit Code Review <gerrit@review>

Thu, 2 Apr 2020 14:46:48 +0000 (14:46 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Thu, 2 Apr 2020 14:46:48 +0000 (14:46 +0000)
committer Gerrit Code Review <gerrit@review>
Thu, 2 Apr 2020 14:46:48 +0000 (14:46 +0000)
diff --cc dali-toolkit/devel-api/file.list
Simple merge
diff --cc dali-toolkit/internal/visuals/visual-factory-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Thu, 2 Apr 2020 14:46:48 +0000 (14:46 +0000)
committer	Gerrit Code Review <gerrit@review>
	Thu, 2 Apr 2020 14:46:48 +0000 (14:46 +0000)
		1	2
dali-toolkit/devel-api/file.list	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/visuals/visual-factory-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history