diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:33:45 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-20 15:20:01 +0000 |
commit | 9c1fe537717255453f86822c959f44360cfa9a27 (patch) | |
tree | bbd27b74963847a409ef476dff106327d37d8b48 /examples/nfc/ndefeditor | |
parent | 32748a3b04f67af77573eefdc36586d4f7f49e98 (diff) | |
parent | ddfb06fb8a2df4d9bf13eabb52edd3ad858b8c14 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file:
dependencies.yaml
Change-Id: Id3187c943acccb6d77a377f205a7822e2d0a54d4
Diffstat (limited to 'examples/nfc/ndefeditor')
0 files changed, 0 insertions, 0 deletions