Merge the code from tizen_2.4 08/56608/3 submit/tizen_mobile/20160113.070328 submit/tizen_tv/20160113.070350 submit/tizen_wearable/20160113.070410
authorTaejin Woo <tt.woo@samsung.com>
Fri, 8 Jan 2016 04:35:31 +0000 (13:35 +0900)
committerTaejin Woo <tt.woo@samsung.com>
Mon, 11 Jan 2016 23:06:35 +0000 (08:06 +0900)
commit41bfe957df119c7d3693451fe94b950bccf70904
tree59982529610a033a81fc07dc6ff35cacb32cb0cb
parent45214c9273e9366127f068c83d84acf4ee344e0c
Merge the code from tizen_2.4

Change-Id: Id763ee7f503c8b0535b6d437f69d65710d98c011
Signed-off-by: Taejin Woo <tt.woo@samsung.com>
70 files changed:
CMakeLists.txt
bt-api/CMakeLists.txt
bt-api/bt-adapter.c
bt-api/bt-common.c
bt-api/bt-device.c
bt-api/bt-event-handler.c
bt-api/bt-gatt-client.c
bt-api/bt-gatt-service.c
bt-api/bt-hdp.c
bt-api/bt-hid-device.c
bt-api/bt-ipsp.c [new file with mode: 0644]
bt-api/bt-request-sender.c
bt-api/bt-rfcomm-client.c
bt-api/bt-rfcomm-server.c
bt-api/bt-scmst.c
bt-api/bt-telephony.c
bt-api/include/bt-common.h
bt-api/include/bt-request-sender.h
bt-core/CMakeLists.txt
bt-core/bt-core-adapter.c
bt-core/bt-core-dbus-handler.c
bt-core/bt-core-main.c
bt-core/bt-core-noti-handler.c
bt-core/include/bt-core-dbus-handler.h
bt-httpproxy/CMakeLists.txt [new file with mode: 0644]
bt-httpproxy/bt-httpproxy.c [new file with mode: 0644]
bt-httpproxy/bt-httpproxy.h [new file with mode: 0644]
bt-httpproxy/org.projectx.httpproxy.service [new file with mode: 0644]
bt-service/CMakeLists.txt
bt-service/bt-request-handler.c
bt-service/bt-service-adapter-le.c
bt-service/bt-service-adapter.c
bt-service/bt-service-agent.c
bt-service/bt-service-audio.c
bt-service/bt-service-avrcp.c
bt-service/bt-service-common.c
bt-service/bt-service-device.c
bt-service/bt-service-event-receiver.c
bt-service/bt-service-event-sender.c
bt-service/bt-service-gap-agent.c
bt-service/bt-service-main.c
bt-service/bt-service-network.c
bt-service/bt-service-obex-agent.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-pbap.c
bt-service/bt-service-rfcomm-client.c
bt-service/bt-service-rfcomm-server.c
bt-service/include/bt-service-adapter-le.h
bt-service/include/bt-service-common.h
bt-service/include/bt-service-device.h
bt-service/include/bt-service-obex-server.h
bt-service/org.projectx.bt.service
include/bluetooth-api.h
include/bluetooth-audio-api.h
include/bluetooth-ipsp-api.h [new file with mode: 0644]
include/bluetooth-telephony-api.h
include/bt-internal-types.h
packaging/bluetooth-frwk.spec
test/CMakeLists.txt
test/bluetooth-frwk-test.c
test/gatt-test/CMakeLists.txt
test/gatt-test/bluetooth-gatt-test.c
test/handsfree/CMakeLists.txt
test/handsfree/bluetooth-hf-test.c
test/le-adv/CMakeLists.txt
test/le-adv/bluetooth-advertising-test.c
test/media-control/CMakeLists.txt
test/telephony/bluetooth-telephony-test.c