Merge "Add new properties to ProgressBar" into devel/master

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

Mon, 6 Feb 2017 14:05:40 +0000 (06:05 -0800)

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

Mon, 6 Feb 2017 14:05:40 +0000 (06:05 -0800)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Mon, 6 Feb 2017 14:05:40 +0000 (06:05 -0800)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 6 Feb 2017 14:05:40 +0000 (06:05 -0800)
diff --cc dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
Simple merge
diff --cc dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Mon, 6 Feb 2017 14:05:40 +0000 (06:05 -0800)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Mon, 6 Feb 2017 14:05:40 +0000 (06:05 -0800)
		1	2
dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json	patch \|	diff1 \|	diff2 \|	blob \| history