merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:13:35 +0000 (01:13 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:13:35 +0000 (01:13 +0900)
commit51b6def72a4d88d85bb45bdacee47d6afb04c06f
tree807bca4698e30cba1a8941afb2890bf67fe8de09
parentaf8ecf1fb35eb946701c15aff0fcd84efebed041
merge with master
34 files changed:
nfc-manager.manifest
packaging/nfc-manager.spec
src/clientlib/CMakeLists.txt
src/clientlib/include/net_nfc_apdu.h [deleted file]
src/clientlib/include/net_nfc_client_dispatcher_private.h
src/clientlib/include/net_nfc_client_ipc_private.h
src/clientlib/include/net_nfc_internal_se.h
src/clientlib/net_nfc_client_dispatcher.c
src/clientlib/net_nfc_client_exchanger.c
src/clientlib/net_nfc_client_internal_se.c
src/clientlib/net_nfc_client_ipc.c
src/clientlib/net_nfc_client_llcp.c
src/clientlib/net_nfc_client_nfc.c
src/clientlib/net_nfc_client_tag.c
src/clientlib/net_nfc_client_test.c
src/commonlib/include/net_nfc_oem_controller.h
src/commonlib/include/net_nfc_typedef.h
src/commonlib/include/net_nfc_typedef_private.h
src/manager/CMakeLists.txt
src/manager/include/net_nfc_controller_private.h
src/manager/include/net_nfc_server_dispatcher_private.h
src/manager/include/net_nfc_service_llcp_private.h
src/manager/include/net_nfc_service_private.h
src/manager/include/net_nfc_service_se_private.h
src/manager/include/net_nfc_service_tag_private.h
src/manager/include/net_nfc_service_test_private.h [new file with mode: 0755]
src/manager/net_nfc_controller.c
src/manager/net_nfc_server_dispatcher.c
src/manager/net_nfc_server_ipc.c
src/manager/net_nfc_service.c
src/manager/net_nfc_service_se.c
src/manager/net_nfc_service_tag.c
src/manager/net_nfc_service_test.c [new file with mode: 0644]
src/manager/net_nfc_util_access_control.c