summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-05 08:59:33 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-05 08:59:39 +0200
commitfa7860d29ce47f25c45edfa654866f8d39de0452 (patch)
treec22a5391332298d6a7d9b32390f41d6f593c9dcf /configure.json
parent54157d73e4710a8adc485dbe4cff622c9b164bdf (diff)
parent0701e01ce23cd1034cb821a66a317d488e3eeb30 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'configure.json')
0 files changed, 0 insertions, 0 deletions