diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:01:34 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:01:34 +0200 |
commit | 347afa3ec58f82da2e4059c1241f3fdd8c5ad2e7 (patch) | |
tree | 2a8916afbb3731e0247cff862b73aa44c4e55fc5 /src/bluetooth/qbluetooth.h | |
parent | abbcb33f41117d4bf8178b87080acb34d16224f9 (diff) | |
parent | 2e0f7adbe4257cc3914db0b4a9e6f42cb12f948d (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I98043b03db3bd420d687fd1db3a7ef74f2a4b728
Diffstat (limited to 'src/bluetooth/qbluetooth.h')
0 files changed, 0 insertions, 0 deletions