Merge "Add AnimatedVectorImageVisualRive example" into devel/master

author Taehyub Kim <taehyub.kim@samsung.com>

Thu, 6 May 2021 06:26:20 +0000 (06:26 +0000)

committer Gerrit Code Review <gerrit@review>

Thu, 6 May 2021 06:26:20 +0000 (06:26 +0000)
author Taehyub Kim <taehyub.kim@samsung.com>
Thu, 6 May 2021 06:26:20 +0000 (06:26 +0000)
committer Gerrit Code Review <gerrit@review>
Thu, 6 May 2021 06:26:20 +0000 (06:26 +0000)
diff --cc examples-reel/dali-examples-reel.cpp
Simple merge
diff --cc resources/po/en_GB.po
Simple merge
diff --cc resources/po/en_US.po
Simple merge
diff --cc shared/dali-demo-strings.h
Simple merge
author	Taehyub Kim <taehyub.kim@samsung.com>
	Thu, 6 May 2021 06:26:20 +0000 (06:26 +0000)
committer	Gerrit Code Review <gerrit@review>
	Thu, 6 May 2021 06:26:20 +0000 (06:26 +0000)
		1	2
examples-reel/dali-examples-reel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
resources/po/en_GB.po	patch \|	diff1 \|	diff2 \|	blob \| history
resources/po/en_US.po	patch \|	diff1 \|	diff2 \|	blob \| history
shared/dali-demo-strings.h	patch \|	diff1 \|	diff2 \|	blob \| history