Merge "Fixed interaction between scale dimensions and bevel percentage properties...

author Adeel Kazmi <adeel.kazmi@samsung.com>

Tue, 30 Aug 2016 17:18:18 +0000 (10:18 -0700)

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

Tue, 30 Aug 2016 17:18:18 +0000 (10:18 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Tue, 30 Aug 2016 17:18:18 +0000 (10:18 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 30 Aug 2016 17:18:18 +0000 (10:18 -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	Adeel Kazmi <adeel.kazmi@samsung.com>
	Tue, 30 Aug 2016 17:18:18 +0000 (10:18 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 30 Aug 2016 17:18:18 +0000 (10:18 -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