diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-21 07:14:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 07:14:40 +0200 |
commit | d10e4c193b0152350e884adcc1060aabd1a974f7 (patch) | |
tree | 23b553e40575d4660709fe8765dcb77e3625103d /src/corelib/tools/qlocale_mac.mm | |
parent | 8d64d1e0c3f7ebcee859e8b5f40aa27a8df86351 (diff) | |
parent | 25e9bde2d665866f7a9a40d1ed3aa8fabcf2ac2f (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9cfefaf22b010fca937be77979f5fb50574bb71e
Diffstat (limited to 'src/corelib/tools/qlocale_mac.mm')
0 files changed, 0 insertions, 0 deletions