Merge branch 'tizen_2.1' into tizen_2.2
authorwoo <s-w.woo@samsung.com>
Wed, 5 Jun 2013 09:29:02 +0000 (18:29 +0900)
committerwoo <s-w.woo@samsung.com>
Wed, 5 Jun 2013 09:42:16 +0000 (18:42 +0900)
commit25e6ffe69ca8952e9534fc946ece3665c92eb483
tree8809cf884690af2e59589d1b1f3e87b9548e9e99
parent4f41b849aa79cf250a24f3d144678b34fc7c458d
parent7fe87cb035cbf2c79afbd62d35ec72f248005b06
Merge branch 'tizen_2.1' into tizen_2.2

Conflicts:
src/ui/FUi_Control.cpp
src/ui/FUi_EflUiEventManager.cpp
src/ui/controls/FUiCtrl_Edit.cpp
src/ui/inc/FUiCtrl_Edit.h

Change-Id: I2d6dfe0e3de1effaba9edfed2db466fa7f1d23be
src/ui/FUi_EflUiEventManager.cpp
src/ui/controls/FUiCtrl_Form.cpp
src/ui/controls/FUiCtrl_Keypad.cpp
src/ui/inc/FUiCtrl_Form.h