Merge "Size Relative feature: Implementation in dali-core plus UTC tests" into tizen

author Kimmo Hoikka <kimmo.hoikka@samsung.com>

Thu, 12 Feb 2015 10:14:55 +0000 (02:14 -0800)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Thu, 12 Feb 2015 10:14:56 +0000 (02:14 -0800)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Thu, 12 Feb 2015 10:14:55 +0000 (02:14 -0800)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 12 Feb 2015 10:14:56 +0000 (02:14 -0800)
diff --cc dali/internal/event/actors/actor-impl.cpp
Simple merge
diff --cc dali/internal/event/actors/actor-impl.h
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Thu, 12 Feb 2015 10:14:55 +0000 (02:14 -0800)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 12 Feb 2015 10:14:56 +0000 (02:14 -0800)
		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