summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlocale.qdoc
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-16 01:00:13 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-16 01:00:13 +0200
commit4e0fcc6ffc2840f08478410a6f90c3044af247b3 (patch)
tree1442b0919f09d9fc6f7e02fd3a0ab783aefe265b /src/corelib/tools/qlocale.qdoc
parent6723155bc768790f14d97a61b74b01e7465ba199 (diff)
parent6bb0cbc6865911c31f5edee7c24f270d265bd46d (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'src/corelib/tools/qlocale.qdoc')
0 files changed, 0 insertions, 0 deletions