summaryrefslogtreecommitdiffstats
path: root/config_help.txt
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-06 01:00:08 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2020-01-06 07:20:18 +0000
commit3a010f72b81d530df96bfb04e0dd2f13a527cc18 (patch)
tree76bcc3439bf0efccc6b354f648817bcf455409f0 /config_help.txt
parent1f87fb359fdff14e42662384a9c8a0bcb3837671 (diff)
parent2c3eaa7b87219d24facfe81a5b22cb218324f1ae (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts: src/corelib/kernel/qvariant.h Change-Id: I8f3873e74b9795ac889e7c7ec5de2619bca92160
Diffstat (limited to 'config_help.txt')
0 files changed, 0 insertions, 0 deletions