diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-09-26 08:28:40 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-09-26 08:29:12 +0200 |
| commit | c1aabdba2e839ba525a4918eebfbf6fbbe96d34d (patch) | |
| tree | d154275f00d6a8cbcf792f298654fb6ab12f6044 /src/bluetooth/qbluetoothsocket.cpp | |
| parent | dc34c7aae7d4d641f4d06990141c7915542363ee (diff) | |
| parent | b7f4825cbf24c357d2f562ecdd81bc5109f4439f (diff) | |
Merge branch '5.4' into btle
Change-Id: Ic5f6b510e43afbebc9bb76aa7bcd68a27d4a4a9b
Diffstat (limited to 'src/bluetooth/qbluetoothsocket.cpp')
0 files changed, 0 insertions, 0 deletions