Merge "Added config section to stylesheet" into devel/master

author minho.sun <minho.sun@samsung.com>

Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)
author minho.sun <minho.sun@samsung.com>
Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)
diff --cc dali-toolkit/devel-api/file.list
Simple merge
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
diff --cc dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
Simple merge
author	minho.sun <minho.sun@samsung.com>
	Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)
		1	2
dali-toolkit/devel-api/file.list	patch \|	diff1 \|	diff2 \|	blob \| history
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
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json	patch \|	diff1 \|	diff2 \|	blob \| history