Merge "(Actor) Fix mismatch between GetTargetSize method and Size property" into...

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

Tue, 2 May 2017 18:24:53 +0000 (18:24 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Tue, 2 May 2017 18:24:53 +0000 (18:24 +0000)
author David Steele <david.steele@samsung.com>
Tue, 2 May 2017 18:24:53 +0000 (18:24 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 2 May 2017 18:24:53 +0000 (18:24 +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>
	Tue, 2 May 2017 18:24:53 +0000 (18:24 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 2 May 2017 18:24:53 +0000 (18:24 +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