Merge "Added New methods to cater for second step initialization" into devel/master

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

Thu, 20 Oct 2016 15:14:53 +0000 (08:14 -0700)

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

Thu, 20 Oct 2016 15:14:53 +0000 (08:14 -0700)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Thu, 20 Oct 2016 15:14:53 +0000 (08:14 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 20 Oct 2016 15:14:53 +0000 (08:14 -0700)
diff --cc dali-toolkit/internal/visuals/image/image-visual.cpp
Simple merge
diff --cc dali-toolkit/internal/visuals/image/image-visual.h
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Thu, 20 Oct 2016 15:14:53 +0000 (08:14 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 20 Oct 2016 15:14:53 +0000 (08:14 -0700)
		1	2
dali-toolkit/internal/visuals/image/image-visual.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/visuals/image/image-visual.h	patch \|	diff1 \|	diff2 \|	blob \| history