merge latest code 35/40535/2 accepted/tizen/mobile/20150605.094020 submit/tizen_mobile/20150605.043521 submit/tizen_mobile/20150605.074810
authorjuhee,park <juhee82.park@samsung.com>
Fri, 5 Jun 2015 04:20:44 +0000 (13:20 +0900)
committerjuhee park <juhee82.park@samsung.com>
Fri, 5 Jun 2015 04:24:14 +0000 (21:24 -0700)
commit5d6e9f406d69e14917baf0da25d9c8263518fdf0
tree49e17e57bdc41ad4b617b7cbe332809e9e4b4d6b
parent476396e386b3cedea3d96d41ae59a4f1d3835d96
merge latest code
(
commit: 5fb2864d15c0aad16848207b9d22569af402c789
Author: YoungHun Cho <hoon.cho@samsung.com>
Date:   Wed Jun 3 20:54:46 2015 +0900
)

Signed-off-by: juhee,park <juhee82.park@samsung.com>
Change-Id: If1088dfd29bc51fddad4b21ea540104dfef48ac5
31 files changed:
cluster/box-impl.cpp
cluster/box-impl.h
cluster/cluster-data-list.cpp
cluster/cluster-home-accessibility.h
cluster/cluster-home-generic.h
cluster/cluster-view-controller.cpp
cluster/cluster-view-impl.cpp
cluster/custom-box-impl.cpp
cluster/custom-box-impl.h
cluster/custom-cluster-impl.cpp
cluster/widget-data-provider.cpp
cluster/widget-data-provider.h
cluster/widget-data.cpp
cluster/widget-data.h
common/homescreen-const.cpp
common/homescreen-const.h
mainmenu/mainmenu-apps-view-impl.cpp
mainmenu/mainmenu-apps-view-impl.h
mainmenu/mainmenu-apps-view.cpp
mainmenu/mainmenu-apps-view.h
mainmenu/mainmenu-folder-box-impl.cpp
mainmenu/mainmenu-folder-box-impl.h
mainmenu/mainmenu-folder-page-impl.cpp
mainmenu/mainmenu-folder-page-impl.h
mainmenu/mainmenu-folder-page.cpp
mainmenu/mainmenu-folder-page.h
mainmenu/mainmenu-folder-view-impl.cpp
mainmenu/mainmenu-folder-view-impl.h
mainmenu/mainmenu-folder-view.cpp
mainmenu/mainmenu-folder-view.h
mainmenu/mainmenu-view-manager-impl.cpp