Merge branch 'tizen_2.2' into tizen 36/13536/1 accepted/tizen/mobile tizen accepted/tizen/20131209.172603 submit/tizen/20131209.114524
authorWoowon <woowon.park@samsung.com>
Mon, 9 Dec 2013 07:31:41 +0000 (16:31 +0900)
committerWoowon <woowon.park@samsung.com>
Mon, 9 Dec 2013 07:31:41 +0000 (16:31 +0900)
commitcdde57347348a7519658514f41c326f6e20a5912
treec10f839a239db428518ca8a476115ac5ceb85de7
parent185e695159b72f5ea4a9c8d6a5bd95299b8f213e
Merge branch 'tizen_2.2' into tizen

Change-Id: I478a1dbff7507dff10e32099f858473e4b9c7fc1
Signed-off-by: Woowon <woowon.park@samsung.com>
30 files changed:
CMakeLists.txt
inc/FNetNfc.h
inc/FNetNfcINdefMessageDiscoveryEventListener.h
inc/FNetNfcINdefPushManagerListener.h
inc/FNetNfcINdefTagConnectionListener.h
inc/FNetNfcINfcDeviceDiscoveryEventListener.h
inc/FNetNfcINfcManagerEventListener.h
inc/FNetNfcINfcTagDiscoveryEventListener.h
inc/FNetNfcITagConnectionListener.h
inc/FNetNfcNdefMessage.h
inc/FNetNfcNdefPushManager.h
inc/FNetNfcNdefRecord.h
inc/FNetNfcNdefRecordType.h
inc/FNetNfcNdefTagConnection.h
inc/FNetNfcNfcManager.h
inc/FNetNfcNfcTag.h
inc/FNetNfcNfcTypes.h
inc/FNetNfcTagConnection.h
packaging/osp-nfc.spec
src/FNetNfcNfcManager.cpp
src/FNetNfc_NdefMessageImpl.cpp
src/FNetNfc_NdefMessageUtil.cpp
src/FNetNfc_NdefRecordImpl.cpp
src/FNetNfc_NdefRecordTypeImpl.cpp
src/FNetNfc_NfcIpcProxy.cpp
src/FNetNfc_NfcIpcProxy.h
src/FNetNfc_NfcManagerImpl.cpp
src/FNetNfc_NfcSystemAdapter.cpp
src/FNetNfc_NfcSystemAdapter.h
src/inc/FNetNfc_ConnectivityIpcMessages.h