diff options
author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:55:28 +0200 |
commit | 4feae652c9c12ec4e5ef4c7bd575f8f316494add (patch) | |
tree | 06571ec9b38fe312cba430092ab4a82ace5c6af1 /src/bluetooth/bluez/org.openobex.transfer.xml | |
parent | 7761bb88000c19d2f5bfb1182f5c5ddf7dae6c5a (diff) | |
parent | b0089abb05e6f60cc252068be1ba40be32e29bd3 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I7a55929aefa1f7a4dc96f841317b78b248899f67
Diffstat (limited to 'src/bluetooth/bluez/org.openobex.transfer.xml')
0 files changed, 0 insertions, 0 deletions