Merge from 2.2 50/13550/2 accepted/tizen/mobile tizen accepted/tizen/mobile/20131216.220422 submit/tizen/20131210.014832
authoreh1112.kim <eh1112.kim@samsung.com>
Mon, 9 Dec 2013 09:59:37 +0000 (18:59 +0900)
committereh1112.kim <eh1112.kim@samsung.com>
Mon, 9 Dec 2013 12:23:54 +0000 (21:23 +0900)
commit2886398caac008b198bd7b50b6aee105e326c345
tree401c94645ca61ca5b62e8c4dcae02ab307a26411
parentfd5a5aab8990aebb584080a00783c0e1df03b6e2
Merge from 2.2

Change-Id: Ia46e034cc03498005ec85db1f34939ae43ceb340
Signed-off-by: eh1112.kim <eh1112.kim@samsung.com>
25 files changed:
CMakeLists.txt [changed mode: 0644->0755]
inc/FTelCallInfo.h
inc/FTelCallManager.h
inc/FTelISimStateManagerGetPinLockSettingResultListener.h
inc/FTelITelephonyCallEventListener.h [changed mode: 0644->0755]
inc/FTelITelephonyCallForwardListener.h
inc/FTelITelephonyNetworkEventListener.h [changed mode: 0644->0755]
inc/FTelITelephonyNetworkSettingListener.h
inc/FTelITelephonySimEventListener.h
inc/FTelNetworkInfo.h
inc/FTelNetworkManager.h
inc/FTelNetworkStatus.h
inc/FTelSimInfo.h
inc/FTelSimStateManager.h
inc/FTelTypes.h
inc/FTelephony.h [changed mode: 0644->0755]
src/FTelCallInfo.cpp [changed mode: 0644->0755]
src/FTel_CallManagerImpl.cpp [changed mode: 0644->0755]
src/FTel_NetworkManagerEventArg.cpp [changed mode: 0644->0755]
src/FTel_NetworkManagerImpl.cpp
src/FTel_NetworkManagerImpl.h [changed mode: 0644->0755]
src/FTel_SimStateManagerImpl.cpp [changed mode: 0644->0755]
src/FTel_TelephonyIpcProxy.cpp
src/FTel_TelephonyIpcProxy.h [changed mode: 0644->0755]
src/inc/FTel_ConnectivityIpcMessages.h