Merge branch 'master' into tizen_2.1
authorDoHyun Pyun <dh79.pyun@samsung.com>
Thu, 21 Mar 2013 23:40:56 +0000 (08:40 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Thu, 21 Mar 2013 23:40:56 +0000 (08:40 +0900)
commit947ff08fb93d4b25464e9ee500fac59dd090210a
treebe716ca86af3e1ed272895e558ac160d70d76c9e
parentf5128c6f06ae55ae814a7f46e50656f3f95c6857
Merge branch 'master' into tizen_2.1

Change-Id: I7bbb84fb1cb92abe69884b64c07bef1fa638938e
21 files changed:
AUTHORS
LICENSE.APLv2 [new file with mode: 0644]
NOTICE [new file with mode: 0644]
include/bluetooth.h
include/bluetooth_private.h
packaging/capi-network-bluetooth.spec
src/bluetooth-adapter.c
src/bluetooth-audio.c
src/bluetooth-avrcp.c
src/bluetooth-common.c
src/bluetooth-device.c
src/bluetooth-gatt.c
src/bluetooth-hdp.c
src/bluetooth-hid.c
src/bluetooth-opp-client.c
src/bluetooth-opp-server.c
src/bluetooth-pan.c
src/bluetooth-socket.c
test/bt_chat_client.c
test/bt_chat_server.c
test/bt_unit_test.c