summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-02-04 05:34:04 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-02-04 05:34:04 +0000
commitba0056373674f2ed34ed8f689867d76dcc962a0e (patch)
tree4dc6f2e0723048ff0fe5be4ebc0a781957c6e173 /src/core
parent736b2c5785060b2d9c4b9c40c31408fa5e990f8a (diff)
parent5e5234a46394e9496df4f74f15d6e6fe708639c0 (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6.0" into refs/staging/5.6.0
Diffstat (limited to 'src/core')
0 files changed, 0 insertions, 0 deletions