Merging master changes to tizen_2.1 branch
authorVinay Dutt Vyas <vinay.vyas@samsung.com>
Tue, 21 May 2013 10:48:51 +0000 (16:18 +0530)
committerAyush <ayush.sriv@samsung.com>
Tue, 21 May 2013 14:06:52 +0000 (19:36 +0530)
commit74f6f925421b4c15438ba63aec1420e69baa3eaf
tree521589abed4b2f18bfc25910de299974f2500753
parent9ac768614217a99684ee55eab9a822a86affc005
Merging master changes to tizen_2.1 branch

Change-Id: Iad0723ca18dfd17663b49182ff17c7d68bde6a22
Signed-off-by: Ayush <ayush.sriv@samsung.com>
19 files changed:
src/ui/controls/FUiCtrl_ColorPicker.cpp
src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
src/ui/controls/FUiCtrl_ExpandableListImpl.cpp
src/ui/controls/FUiCtrl_ListBaseImpl.cpp
src/ui/controls/FUiCtrl_OptionMenu.cpp
src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp
src/ui/controls/FUiCtrl_Tab.cpp
src/ui/controls/FUiCtrl_TabPresenter.cpp
src/ui/inc/FUiCtrl_ColorPicker.h
src/ui/inc/FUiCtrl_ColorPickerPresenter.h
src/ui/inc/FUiCtrl_OptionMenu.h
src/ui/inc/FUiCtrl_OptionMenuPresenter.h
src/ui/inc/FUiCtrl_Tab.h
src/ui/inc/FUiCtrl_TabPresenter.h
src/ui/inc/FUi_ResourceListConfig.h
src/ui/inc/FUi_ResourceTableViewConfig.h
src/ui/resource/FUi_ResourceConfigParser.cpp
src/ui/resource/FUi_ResourceListConfig.cpp
src/ui/resource/FUi_ResourceTableViewConfig.cpp