Merge branch 'tizen_2.4' of ssh://spin:29418/apps/widget/widget into tizen accepted/tizen/mobile/20150530.065423 accepted/tizen/mobile/20150609.090349 submit/tizen_mobile/20150527.071719 submit/tizen_mobile/20150529.103212 submit/tizen_mobile/20150609.051219
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 13:16:53 +0000 (22:16 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 13:16:53 +0000 (22:16 +0900)
commit9648c63ba09461f7f28faac3d3c2c5d50e324c7c
tree457d065cda5387dd37d3c52b5dc97da8129ad222
parent9e6cb6e0b47c0462f4fbef29af1918f1981ef809
parent5f3e53e229c3ec0bcbf47c0fc01beef881333500
Merge branch 'tizen_2.4' of ssh://spin:29418/apps/widget/widget into tizen

Conflicts:
src/snapshot_window.c

Change-Id: I6708a6664b69635011b243d6b244018fdcf79855
src/virtual_window.c