summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-22 10:12:38 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-22 10:12:38 +0200
commitebd4605c712941030edac8f5b7c32971e9541f7a (patch)
treecf1c8f5b39dc9929c0019418b69a8dcf0640b566 /configure.json
parentfe125fa8834a4b99f18be14cbe5dfe02dcd56dde (diff)
parenta5c819cef6efa06c8273c9b5e5e6406a0ae9c469 (diff)
Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0
Diffstat (limited to 'configure.json')
0 files changed, 0 insertions, 0 deletions