summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-09-17 21:03:57 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-09-18 01:37:25 +0200
commite46a92d178129e6772d8e8db4632b3346ddacac4 (patch)
tree8d777b3f14d520572f43a861a801c7803055f05a /src/plugins
parent1fae8cb48c6d003681fbf521a0ed8c24c84bf9ad (diff)
parentc95b119596c17d8430b24d5e10c4f48fd0a88cb1 (diff)
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions