summaryrefslogtreecommitdiffstats
path: root/src/corelib/text/qlocale_tools_p.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-05 01:01:05 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-05 01:01:06 +0200
commit327b305e95187fda869c5af407e78a17e0e381cd (patch)
treefc51c7579a9c1fed3c3993ac2ea68bf9dd32f8bb /src/corelib/text/qlocale_tools_p.h
parentda284ef10e0ef80776b9fc9b7bb0e6dc8d71ba63 (diff)
parenta2e718a71abad719ea196e9dc4d90d9267102f54 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/corelib/text/qlocale_tools_p.h')
0 files changed, 0 insertions, 0 deletions