summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-03-04 13:41:52 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-03-04 13:44:29 +0100
commit8ac63a3323585de28428df3f376bdf3f3c2a67fb (patch)
treed0c4f9f0d48864ca5439bba3186485df48d0d165 /src/corelib
parent59f168c5e5eec7ac247e6154a65f85a7ccc6e7ad (diff)
parent88550543f8b4b7c76bffeebb923ad1f72b774b6e (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions