summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-11-12 11:57:20 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-11-12 11:57:59 +0100
commit06ad5d54f5c88ad2859af33ff3e02ce20b4d6471 (patch)
treeab16f008ac98c3f1ca7ef14a6e0ec5dc221140c6 /src/core
parent4f4a33467f4d41b1224948cc4c5d8828232b141a (diff)
parentaa1b2d20a80f53ce5e7f6097114d41a018d9350b (diff)
Merge remote-tracking branch 'origin/5.4' into 5.4.0
Diffstat (limited to 'src/core')
0 files changed, 0 insertions, 0 deletions