diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:07:20 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:07:20 +0100 |
commit | a096dfe555762ed4cee747c99c274bd8d912fe66 (patch) | |
tree | c218bddfc62eeb3fd4a586d76a7c5862b1c8e2de /src/bluetooth/qbluetoothlocaldevice_p.h | |
parent | 95c8e91d498efada85533e82bd55e7f58098f7e3 (diff) | |
parent | 0910eb9a769fbcf437dd86db2385496b498e752f (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I21c1c1bc2cffde68bb13f56f08e10564464585c1
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_p.h')
0 files changed, 0 insertions, 0 deletions