diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-29 12:50:54 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-29 12:50:54 +0000 |
commit | 592da13664b9c946ab793bd576cf83ed3c2b80e6 (patch) | |
tree | e14e1f5512b1d18b3db96caeff6e5c2401d74ed5 /src/corelib/io/qstandardpaths.h | |
parent | b9b3bff424677a84cdd73fd34f7514c2f700e612 (diff) | |
parent | f27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/io/qstandardpaths.h')
0 files changed, 0 insertions, 0 deletions