summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-11-18 00:30:38 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-11-18 00:30:38 +0000
commit7c05a0cc9904e7a42c20e0b7751082f7f812e28d (patch)
tree13084b5ba01a0996eac2c403b432809db78f1ede /src/corelib/tools/qstring.cpp
parentb72d1db446231311a7ee855ed3e0fbb64a62ea06 (diff)
parent17dc773221c402308ddf15bcdb622b00ab7a95c3 (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
0 files changed, 0 insertions, 0 deletions