Merge "[3.0] Rename color property of primitive visual to mixColor." into tizen

author Taeyoon Lee <taeyoon0.lee@samsung.com>

Fri, 2 Sep 2016 09:11:17 +0000 (02:11 -0700)

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

Fri, 2 Sep 2016 09:11:17 +0000 (02:11 -0700)
author Taeyoon Lee <taeyoon0.lee@samsung.com>
Fri, 2 Sep 2016 09:11:17 +0000 (02:11 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 2 Sep 2016 09:11:17 +0000 (02:11 -0700)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
Simple merge
diff --cc dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
Simple merge
author	Taeyoon Lee <taeyoon0.lee@samsung.com>
	Fri, 2 Sep 2016 09:11:17 +0000 (02:11 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 2 Sep 2016 09:11:17 +0000 (02:11 -0700)
		1	2
automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/visuals/primitive/primitive-visual.cpp	patch \|	diff1 \|	diff2 \|	blob \| history