summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qloggingregistry_p.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-29 12:50:54 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-06-29 12:50:54 +0000
commit592da13664b9c946ab793bd576cf83ed3c2b80e6 (patch)
treee14e1f5512b1d18b3db96caeff6e5c2401d74ed5 /src/corelib/io/qloggingregistry_p.h
parentb9b3bff424677a84cdd73fd34f7514c2f700e612 (diff)
parentf27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/io/qloggingregistry_p.h')
0 files changed, 0 insertions, 0 deletions