OSDN Git Service

Merge branch 'for-upstream' of git://gitorious.org/bluez/cktakahasis-clone
authorMarcel Holtmann <marcel@holtmann.org>
Tue, 2 Sep 2008 00:28:33 +0000 (02:28 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 2 Sep 2008 00:28:33 +0000 (02:28 +0200)
commit0c05dd3dc5a18d64734a9f091d5285612e41107b
tree57de979b0fdef6c07329d0aae06235730a2fb4cb
parent4f946e36897fc67a28a56fb3102994da6857a038
parent3f498e694e39756890db475f1f1edb528b378ee2
Merge branch 'for-upstream' of git://gitorious.org/bluez/cktakahasis-clone
src/adapter.c
src/main.c