summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-01 01:01:28 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-01 01:01:28 +0100
commitf09fc1f35294827245e74ced48274387d5ed346f (patch)
tree4c07e40a13fd5be82f2afe4a38165b46dd385d34 /src/corelib/serialization
parentcc9645f11b46aaad36658d62d38a5e44a5ba5ae5 (diff)
parentf5c0a19077989b5ac14071ecd095e29f62d05602 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'src/corelib/serialization')
0 files changed, 0 insertions, 0 deletions