merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:19 +0000 (01:17 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:19 +0000 (01:17 +0900)
commitd9f955cfbdc35f604bbcd72b236b55770ab65d30
treec27e045feb0b341191cfc897f888d82634bc2cff
parent8f16c22094926d675a255a96ae8edcc12eb0079a
merge with master
36 files changed:
CMakeLists.txt
inc/FTelCallManager.h
inc/FTelISimStateManagerGetPinLockSettingResultListener.h [new file with mode: 0644]
inc/FTelITelephonyCallForwardListener.h
inc/FTelITelephonyNetworkSettingListener.h
inc/FTelITelephonySimEventListener.h [new file with mode: 0644]
inc/FTelNetworkInfo.h
inc/FTelNetworkManager.h
inc/FTelNetworkStatus.h
inc/FTelSimInfo.h
inc/FTelSimStateManager.h [new file with mode: 0644]
inc/FTelTypes.h
inc/FTelephony.h
packaging/osp-telephony.spec [changed mode: 0644->0755]
src/FTelNetworkInfo.cpp
src/FTelNetworkManager.cpp
src/FTelNetworkStatus.cpp
src/FTelSimInfo.cpp
src/FTelSimStateManager.cpp [new file with mode: 0644]
src/FTel_NetworkManagerEvent.h
src/FTel_NetworkManagerEventArg.cpp
src/FTel_SimEvent.cpp [new file with mode: 0644]
src/FTel_SimEvent.h [new file with mode: 0644]
src/FTel_SimEventArg.cpp [new file with mode: 0644]
src/FTel_SimEventArg.h [new file with mode: 0644]
src/FTel_SimInfoImpl.cpp
src/FTel_SimInfoImpl.h
src/FTel_SimManagerEvent.cpp [new file with mode: 0644]
src/FTel_SimManagerEvent.h [new file with mode: 0644]
src/FTel_SimManagerEventArg.cpp [new file with mode: 0644]
src/FTel_SimManagerEventArg.h [new file with mode: 0644]
src/FTel_SimStateManagerImpl.cpp [new file with mode: 0644]
src/FTel_SimStateManagerImpl.h [new file with mode: 0644]
src/FTel_TelephonyIpcMessages.cpp
src/FTel_TelephonyIpcProxy.h
src/FTel_TelephonyUtility.h