diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:09:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:09:15 +0100 |
| commit | 5a38231103159346c976a620c01fba37eea85d92 (patch) | |
| tree | ab0f41ce6f4f6189ff261d10802d38df45db7278 /src/nfc | |
| parent | 6efa28f0c193adf0151bb78d9660fa1fe6e8c525 (diff) | |
| parent | ca6b84af1612440a925b4a8223cbed4beb9ac33e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I549972a6521a33a1c52fcbf0506a6aff502b364c
Diffstat (limited to 'src/nfc')
0 files changed, 0 insertions, 0 deletions