Re-merge the codes
authorDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 24 Aug 2012 07:12:28 +0000 (16:12 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 24 Aug 2012 07:12:28 +0000 (16:12 +0900)
commit3b81f3fd18273d9c1ff056d82ec54aea8744f342
treead0062a115dde772a901971bb2c4425740cd90b3
parent188d29dd3e46336bbb7549ad00d139a330672685
Re-merge the codes

[Comment] There was some missed codes in previous patchset
36 files changed:
CMakeLists.txt
bluetooth-frwk-agent/CMakeLists.txt
bluetooth-frwk-agent/bluetooth-agent-cb.c
bluetooth-frwk-agent/bluetooth-agent.c
bluetooth-frwk-agent/bluetooth-agent.h
bluetooth-frwk-agent/sc_core_agent.c
bluetooth-frwk-agent/sc_core_agent.h
bluetooth-frwk-agent/sc_core_agent.xml
bluetooth-map-agent/CMakeLists.txt
bluetooth-map-agent/bluetooth_map_agent.c
bluetooth-pb-agent/CMakeLists.txt
bluetooth-pb-agent/bluetooth_pb_agent.c
bluetooth-pb-agent/bluetooth_pb_agent.xml
bluetooth-telephony/bluetooth-telephony-api.c
bluetooth-telephony/bluetooth-telephony-api.h
debian/changelog
debian/rules
lib/CMakeLists.txt
lib/bluetooth-api-common.c
lib/bluetooth-api-common.h
lib/bluetooth-api.h
lib/bluetooth-api.pc.in
lib/bluetooth-gap-api.c
lib/bluetooth-hdp-api.c
lib/bluetooth-hdp-api.h
lib/bluetooth-hid-api.c
lib/bluetooth-hid-api.h
lib/bluetooth-network-api.c
lib/bluetooth-obex-server-api.c
lib/bluetooth-obex-server-api.h
lib/bluetooth-opc-api.c
lib/bluetooth-opc-api.h
lib/bluetooth-rfcomm-api.c
lib/bluetooth-rfcomm-api.h
lib/bluetooth-sdp-api.c
packaging/bluetooth-frwk.spec