diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:01:12 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2019-10-14 08:43:23 +0200 |
| commit | 11f8350412c26f7693b1714e4a30eddd924b8c86 (patch) | |
| tree | afafdfbb606241d42e67b6277258d529efd9329d /.gitignore | |
| parent | 15e414cd0ac29f9224206a07e9872c2ef06a88a2 (diff) | |
| parent | 1a32211d8df7b0f06c75707b1bec029f48789d16 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/bluetooth/bluetooth.pro
Change-Id: Ibc52464c7d607b13950eb1e67f565a9909541026
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions