summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstringalgorithms_p.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-10 01:00:41 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2019-07-10 10:39:33 +0200
commit6fd20defb95f0f3a7d1162641bd4ae9e0ed91bcc (patch)
tree2d8c70bc359810f926374ffebd649576345a9c7f /src/corelib/tools/qstringalgorithms_p.h
parentd72ea9cbd3c2bde4645745c5aeba7cc052d87f0d (diff)
parent4bb975717b0ba2c7b41e1a44192c2d54c919cfee (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: src/corelib/time/qdatetime.cpp src/widgets/widgets/qcombobox.h Change-Id: Ib84352e8fe34aed2986a1c94e7346a46a71c803b
Diffstat (limited to 'src/corelib/tools/qstringalgorithms_p.h')
0 files changed, 0 insertions, 0 deletions