From: Sung-jae Park <nicesj.park@samsung.com>
Date: Tue, 26 May 2015 13:16:53 +0000 (+0900)
Subject: Merge branch 'tizen_2.4' of ssh://spin:29418/apps/widget/widget into tizen
X-Git-Tag: submit/tizen_mobile/20150609.051219
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen_mobile%2F20150609.051219;p=apps%2Fnative%2Fwidget%2Fwidget.git

Merge branch 'tizen_2.4' of ssh://spin:29418/apps/widget/widget into tizen

Conflicts:
	src/snapshot_window.c

Change-Id: I6708a6664b69635011b243d6b244018fdcf79855
---

9648c63ba09461f7f28faac3d3c2c5d50e324c7c