Merge "spinner: Merge upstream code into tizen_3.0" into tizen

author Woochan Lee <wc0917.lee@samsung.com>

Tue, 26 Apr 2016 08:24:26 +0000 (01:24 -0700)

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

Tue, 26 Apr 2016 08:24:26 +0000 (01:24 -0700)
author Woochan Lee <wc0917.lee@samsung.com>
Tue, 26 Apr 2016 08:24:26 +0000 (01:24 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 26 Apr 2016 08:24:26 +0000 (01:24 -0700)
diff --cc src/lib/elm_config.c
Simple merge
diff --cc src/lib/elm_priv.h
Simple merge
author	Woochan Lee <wc0917.lee@samsung.com>
	Tue, 26 Apr 2016 08:24:26 +0000 (01:24 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 26 Apr 2016 08:24:26 +0000 (01:24 -0700)
		1	2
src/lib/elm_config.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/elm_priv.h	patch \|	diff1 \|	diff2 \|	blob \| history