summaryrefslogtreecommitdiffstats
path: root/header.GPL
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-07 01:00:10 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-07 01:00:10 +0100
commitcf00c01f68198f55e0be5de4d9b720a31dea1a21 (patch)
tree0d119a5be7ef2a258858ded2b264e96d6cd5a572 /header.GPL
parentada1b61991b16f21c5cd9c785dc7fbfa832f18be (diff)
parent3eb42abab6c7d1f3a32ca55c972b1d7a4a703658 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'header.GPL')
0 files changed, 0 insertions, 0 deletions