Merge "Removed TouchEvent from actor & stage" into devel/master

author David Steele <david.steele@samsung.com>

Thu, 13 Aug 2020 16:59:30 +0000 (16:59 +0000)

committer Gerrit Code Review <gerrit@review>

Thu, 13 Aug 2020 16:59:30 +0000 (16:59 +0000)
author David Steele <david.steele@samsung.com>
Thu, 13 Aug 2020 16:59:30 +0000 (16:59 +0000)
committer Gerrit Code Review <gerrit@review>
Thu, 13 Aug 2020 16:59:30 +0000 (16:59 +0000)
diff --cc dali/internal/event/actors/actor-impl.cpp
Simple merge
diff --cc dali/internal/event/actors/actor-impl.h
Simple merge
author	David Steele <david.steele@samsung.com>
	Thu, 13 Aug 2020 16:59:30 +0000 (16:59 +0000)
committer	Gerrit Code Review <gerrit@review>
	Thu, 13 Aug 2020 16:59:30 +0000 (16:59 +0000)
		1	2
dali/internal/event/actors/actor-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/actor-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history