diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:02:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:02:46 +0100 |
| commit | dafbd24e9fcf74bc946111e2bb1547fc3d44e90b (patch) | |
| tree | 8fe08635d99a91bea4b4448cbdf39d3706df6f51 /src/nfc/qnearfieldmanager.h | |
| parent | 5eb8fd9f69db3b79f37a374f32296f96eb56d6d3 (diff) | |
| parent | 370e84c6d5f7c4f2d3f274ccb250f4baccd4614d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ic64c5646f2a1c1b057f2a27e66b37364a320b12e
Diffstat (limited to 'src/nfc/qnearfieldmanager.h')
0 files changed, 0 insertions, 0 deletions