diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 10:37:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 10:37:07 +0100 |
| commit | 89aaf528c96072dd93505284b9a8fc268e0acd6e (patch) | |
| tree | 3fdb52646b2f60a3641c6585c4b27099902bb08f /sync.profile | |
| parent | 3264db95f965a47f31ffe1ab768467ce827e41e9 (diff) | |
| parent | 90291d71308db90d763e5b42a8f096301ceb9666 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/bluetooth/qbluetoothdeviceinfo.h
Change-Id: I2ad566b9ca8fb001fa91a74501e83e8a2121ef3a
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions