diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-24 07:39:50 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-24 07:49:07 +0200 |
commit | 9881b68c4c7bc1715cd266c41c63a3a918d83b07 (patch) | |
tree | 5252e3e767e64d98383f6103d9d5941a206a52bc /header.BSD-OLD | |
parent | 17a20f95151368a3b92b949b905325865643ca45 (diff) | |
parent | cad869b619fdc0969216e6e9b63fd1afb5edb7db (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7e4c7f9378706438715362b1e2da9a3cd2794562
Diffstat (limited to 'header.BSD-OLD')
0 files changed, 0 insertions, 0 deletions