Merge branch 'master' of gitorious.org:bluedevil/bluedevil
author Alex Fiestas
()
committer Alex Fiestas
()
commit 96c7d7d812226ee68c102811f481fe4fa1d9a893
tree 8a30c36b65ffa7485470522fd375690d6b0f1e4f
parent 6a8f7876ec1683ca34454baf8963d837a4ce2301
parent 8f8c013235b7d246ae5910eed19de4abecd5ce26
Merge branch 'master' of gitorious.org:bluedevil/bluedevil
src/kcmodule/bluedeviladapters.cpp
src/kcmodule/bluedeviladapters.h
src/kio/bluetooth/kiobluetooth.cpp
src/kio/bluetooth/kiobluetooth.h