summaryrefslogtreecommitdiffstats
path: root/header.GPL-EXCEPT
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-15 01:00:31 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-15 01:00:31 +0100
commit4b04e47be90ae809d6061403a9fb43da13d56902 (patch)
treec66b8d9d842a5213e6ba37a64d0baa669015bc20 /header.GPL-EXCEPT
parentd9004632839a8cdb36f9bc82b7a7a3ad7d64d419 (diff)
parente9c08f8287556742fbb927653b4c2d071923e5a7 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'header.GPL-EXCEPT')
0 files changed, 0 insertions, 0 deletions