Merge branch 'master' into tizen_2.1
authorDoHyun Pyun <dh79.pyun@samsung.com>
Tue, 19 Mar 2013 06:04:57 +0000 (15:04 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Tue, 19 Mar 2013 06:04:57 +0000 (15:04 +0900)
commit008772c3a4c662bd78b145032df59153d96517be
tree6655986cd96f9c967ebeb342fb52d8fe45b6dbe1
parentb29d60594b312e3bdb3897e379cd512341595d92
Merge branch 'master' into tizen_2.1

Change-Id: Iaae67b4019fd0604bcd60a7df10fcc5189c0532b
44 files changed:
bluetooth-frwk.manifest
bt-api/bt-adapter.c
bt-api/bt-audio.c
bt-api/bt-avrcp.c
bt-api/bt-common.c
bt-api/bt-device.c
bt-api/bt-gatt.c
bt-api/bt-hdp.c
bt-api/bt-hid.c
bt-api/bt-network.c
bt-api/bt-obex-server.c
bt-api/bt-oob.c
bt-api/bt-opp-client.c
bt-api/bt-rfcomm-client.c
bt-api/bt-rfcomm-server.c
bt-api/bt-telephony.c
bt-api/include/bt-common.h
bt-core/bt_core.c
bt-service/CMakeLists.txt
bt-service/bluetooth-frwk-service.service
bt-service/bt-request-handler.c
bt-service/bt-service-adapter.c
bt-service/bt-service-agent.c
bt-service/bt-service-audio.c
bt-service/bt-service-device.c
bt-service/bt-service-event-receiver.c
bt-service/bt-service-hid.c
bt-service/bt-service-main.c
bt-service/bt-service-network.c
bt-service/bt-service-obex-server.c
bt-service/bt-service-oob.c
bt-service/bt-service-opp-client.c
bt-service/bt-service-rfcomm-client.c
bt-service/bt-service-rfcomm-server.c
bt-service/include/bt-service-audio.h
bt-service/include/bt-service-common.h
bt-service/include/bt-service-obex-server.h
include/bluetooth-api.h
include/bt-internal-types.h
packaging/bluetooth-frwk.spec
test/CMakeLists.txt
test/bluetooth-frwk-test.c
test/gatt-test/CMakeLists.txt [new file with mode: 0644]
test/gatt-test/bluetooth-gatt-test.c [new file with mode: 0644]