diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 20:21:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-06 22:20:08 +0000 |
| commit | 857912b605ea11f6f1e782edfb40555d831eb9ad (patch) | |
| tree | 49a4174a44e06ba55e9253e2e7f6f45fe1764c5c /src/corelib/tools/qtimezone.h | |
| parent | 5aeafcea467ced35adca1d762d38bfbba2b59e1f (diff) | |
| parent | dbef41f43ece97d8ac4d6b63f7a36afcb7e7b7f7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/tools/qtimezone.h')
0 files changed, 0 insertions, 0 deletions